From: Gary Lowell <gary.lowell@inktank.com>
Date: Wed, 14 Nov 2012 01:29:47 +0000 (-0800)
Subject: Merge branch 'next'
X-Git-Tag: v0.55~101
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7926ef53935313501d4a7fe0e587f3e3b00b313c;p=ceph.git

Merge branch 'next'

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

7926ef53935313501d4a7fe0e587f3e3b00b313c
diff --cc configure.ac
index 46a244bfef1,1a86fb60cad..430ba1eb010
--- a/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])