diff options
| author | Gary Lowell <gary.lowell@inktank.com> | 2013-03-05 09:05:21 -0800 |
|---|---|---|
| committer | Gary Lowell <gary.lowell@inktank.com> | 2013-03-05 09:05:21 -0800 |
| commit | 66cadbe515d664180295c9522e7996ed6ca97180 (patch) | |
| tree | 8496829a336d216530ffe06dfe92b5b22749aa07 | |
| parent | 2a7e802d69ba6364c14070c66773b63a1f48b67c (diff) | |
| parent | ba3f91e7504867a52a83399d60917e3414e8c3e2 (diff) | |
| download | ceph-66cadbe515d664180295c9522e7996ed6ca97180.tar.gz | |
Merge branch 'next'
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | src/common/config_opts.h | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index b4b729f4f64..1bea9a50a5f 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/debian/changelog b/debian/changelog index a4edd09826b..cdf32b1ff12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 diff --git a/src/common/config_opts.h b/src/common/config_opts.h index 2af123dad50..c72530e0aa8 100644 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@ -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) |