Merge branch 'next'

Conflicts:
	configure.ac
	src/rgw/rgw_common.cc

diff --cc configure.ac
index 46a244bfef132fc851e3774529339e0973db46d4,1a86fb60cad1a290b5a5dc4e693676c440d1716e..430ba1eb010dada48973cebcaa6817c9af4cedbb
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -8,12 -8,7 +8,13 @@@ AC_PREREQ(2.59
  # NOTE: This version is _only_ used for naming the tarball.  The
  # 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.53], [ceph-devel@vger.kernel.org])
++
+ AC_INIT([ceph], [0.54], [ceph-devel@vger.kernel.org])
 +
 +# Create release string.  Used with VERSION for RPMs.
 +AC_SUBST(RPM_RELEASE)
 +RPM_RELEASE=`if expr index $(git describe --always) '-' > /dev/null ; then git describe --always | cut -d- -f2- | tr '-' '.' ; fi`
 +
  AC_CONFIG_MACRO_DIR([m4])
  
  AC_CONFIG_SUBDIRS([src/gtest])