summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2012-05-20 21:18:36 -0700
committerSage Weil <sage@newdream.net>2012-05-20 21:18:36 -0700
commitd8f4c6d20877f7f710664f5344f18f641d63c649 (patch)
treeeca2bf0a4faedd1c56232877f847e726e66af02b /configure.ac
parent31102d317d7a091f49f9126a6df9087cde0d8118 (diff)
parentad663d58c891dfa74ff6d4d653345358be98ffd7 (diff)
downloadceph-d8f4c6d20877f7f710664f5344f18f641d63c649.tar.gz
Merge branch 'stable'
Conflicts: src/os/FileStore.cc
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 53ae649c24f..d5e6a7ae399 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ 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.46], [ceph-devel@vger.kernel.org])
+AC_INIT([ceph], [0.47], [ceph-devel@vger.kernel.org])
AC_CONFIG_SUBDIRS([src/gtest])
AC_CONFIG_SUBDIRS([src/leveldb])