RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-26 21:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next'

Browse Source
This commit is contained in:
Gary Lowell 2013-03-05 09:05:21 -08:00
commit 66cadbe515
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -8,7 +8,7 @@ AC_PREREQ(2.59)
# VERSION define is not used by the code. It gets a version string
# from 'git describe'; see src/ceph_ver.[ch]
AC_INIT([ceph], [0.57], [ceph-devel@vger.kernel.org])
AC_INIT([ceph], [0.58], [ceph-devel@vger.kernel.org])
# Create release string. Used with VERSION for RPMs.
RPM_RELEASE=0

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
ceph (0.58-1) precise; urgency=low
* New upstream release
-- Gary Lowell <gary.lowell@inktank.com> Mon, 04 Mar 2013 15:17:58 -0800
ceph (0.57-1) quantal; urgency=low
* New upstream release

2
src/common/config_opts.h
View File

@ -467,7 +467,7 @@ OPTION(filestore_kill_at, OPT_INT, 0) // inject a failure at the n'th
OPTION(filestore_inject_stall, OPT_INT, 0) // artificially stall for N seconds in op queue thread
OPTION(filestore_fail_eio, OPT_BOOL, true) // fail/crash on EIO
OPTION(journal_dio, OPT_BOOL, true)
OPTION(journal_aio, OPT_BOOL, true)
OPTION(journal_aio, OPT_BOOL, false)
OPTION(journal_block_align, OPT_BOOL, true)
OPTION(journal_max_write_bytes, OPT_INT, 10 << 20)
OPTION(journal_max_write_entries, OPT_INT, 100)