summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Lowell <gary.lowell@inktank.com>2013-07-22 23:19:47 -0700
committerGary Lowell <gary.lowell@inktank.com>2013-07-22 23:19:47 -0700
commitfc6cb81ebae3b4bc3634e8db04218c9d838db6eb (patch)
treeda178bcab9897b4bed54894154567a1b41210d99
parent84b41987ad0587c7d73e854d319604bdc7f81146 (diff)
parent835dd973012e4e3ffc3dd15bc45bea3a3045f30c (diff)
downloadceph-fc6cb81ebae3b4bc3634e8db04218c9d838db6eb.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 bb03ad5b76f..415da311712 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.66], [ceph-devel@vger.kernel.org])
+AC_INIT([ceph], [0.67-rc1], [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 e31f41af5c1..cfcf0491dd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ceph (0.67-rc1-1) precise; urgency=low
+
+ * New upstream release
+
+ -- Gary Lowell <gary.lowell@inktank.com> Mon, 22 Jul 2013 11:57:01 -0700
+
ceph (0.66-1) precise; urgency=low
* New upstream release