summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-12-17 16:51:20 -0800
committerSage Weil <sage@inktank.com>2012-12-17 16:51:20 -0800
commit0dd1302543422e2bac65d634ed2f1f4260dcae79 (patch)
tree88559773bd9b9839ebf4105b51875006e68f73a0
parent1b67a43891c66475e08c44871b6dde54b2ba510c (diff)
parent8e25c8d984f9258644389a18997ec6bdef8e056b (diff)
downloadceph-0dd1302543422e2bac65d634ed2f1f4260dcae79.tar.gz
Merge remote-tracking branch 'gh/testing' 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 ebaec0f57ba..140867fc325 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ AC_PREREQ(2.59)
# 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.55], [ceph-devel@vger.kernel.org])
+AC_INIT([ceph], [0.55.1], [ceph-devel@vger.kernel.org])
# Create release string. Used with VERSION for RPMs.
AC_SUBST(RPM_RELEASE)
diff --git a/debian/changelog b/debian/changelog
index c5a2297cb23..23d5ff0ff15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ceph (0.55.1-1) precise; urgency=low
+
+ * New upstream release
+
+ -- Gary Lowell <gary.lowell@inktank.com> Wed, 12 Dec 2012 16:24:13 -0800
+
ceph (0.55-1) precise; urgency=low
* New upstream release