diff options
| author | Gary Lowell <gary.lowell@inktank.com> | 2012-11-13 17:29:47 -0800 |
|---|---|---|
| committer | Gary Lowell <gary.lowell@inktank.com> | 2012-11-13 17:29:47 -0800 |
| commit | 7926ef53935313501d4a7fe0e587f3e3b00b313c (patch) | |
| tree | e2696454c53ccc53e3af0ee54b16c73632af3fac /configure.ac | |
| parent | d395131c7f693dd8e9af8f7cd8838f2e9b394f90 (diff) | |
| parent | 60b84b095b1009a305d4d6a5b16f88571cbd3150 (diff) | |
| download | ceph-7926ef53935313501d4a7fe0e587f3e3b00b313c.tar.gz | |
Merge branch 'next'
Conflicts:
configure.ac
src/rgw/rgw_common.cc
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 46a244bfef1..430ba1eb010 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,8 @@ 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) |