summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-06-21 08:20:17 -0700
committerSage Weil <sage@inktank.com>2012-06-21 08:20:17 -0700
commita85a15fef4e846e483636db8c35ed6191f6a9dfa (patch)
treefd13034b1fc57a9bc683f1c66c07431847e22e2b
parent88c7629e041699c25a7c91114bd1ac4ffc64c3eb (diff)
parentc467d9d1b2eac9d3d4706b8e044979aa63b009f8 (diff)
downloadceph-a85a15fef4e846e483636db8c35ed6191f6a9dfa.tar.gz
Merge remote-tracking branch 'gh/stable' into next
-rw-r--r--configure.ac2
-rw-r--r--debian/changelog6
2 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 847c62ce136..3e6d454c911 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.47.2], [ceph-devel@vger.kernel.org])
+AC_INIT([ceph], [0.47.3], [ceph-devel@vger.kernel.org])
AC_CONFIG_SUBDIRS([src/gtest])
AC_CONFIG_SUBDIRS([src/leveldb])
diff --git a/debian/changelog b/debian/changelog
index 22f35a64ef5..aa51f5af0b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ceph (0.47.3-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Sage Weil <sage@newdream.net> Wed, 20 Jun 2012 10:57:03 -0700
+
ceph (0.47.2-1) experimental; urgency=low
* New upstream release