summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Lowell <gary.lowell@inktank.com>2013-10-18 01:51:16 +0000
committerGary Lowell <gary.lowell@inktank.com>2013-10-18 01:51:16 +0000
commit09bd6bbe3b5e66a281da762d34ec71f27f038ac6 (patch)
tree7b6625e9863eca44f4b4be157730b280633331b2
parent9af9c50cf1e20ec94e92c7aec2a0e2a23bbf8b21 (diff)
parente509cb1e69cd39e3702b5351188e60116bafc544 (diff)
downloadceph-09bd6bbe3b5e66a281da762d34ec71f27f038ac6.tar.gz
Merge branch '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 1eee4609ec1..7fc21c37905 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,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.70], [ceph-devel@vger.kernel.org])
+AC_INIT([ceph], [0.71], [ceph-devel@vger.kernel.org])
# Create release string. Used with VERSION for RPMs.
RPM_RELEASE=0
diff --git a/debian/changelog b/debian/changelog
index 4628bb52175..49e08ace0a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ceph (0.71-1) stable; urgency=low
+
+ * New upstream release
+
+ -- Gary Lowell <gary.lowell@inktank.com> Thu, 17 Oct 2013 09:19:02 +0000
+
ceph (0.70-1) stable; urgency=low
* New upstream release