diff options
| author | Gary Lowell <gary.lowell@inktank.com> | 2013-10-05 02:11:36 +0000 |
|---|---|---|
| committer | Gary Lowell <gary.lowell@inktank.com> | 2013-10-05 02:11:36 +0000 |
| commit | 7efbebe20f7372965c81c150e0e3d2c42c18ac4e (patch) | |
| tree | ee6474a81a5beebc93fe44196d2c87ceebb00e25 | |
| parent | e927941fcadff56483137cffc0899b4ab9c6c297 (diff) | |
| parent | e3bb0656d92e74ead0342ae696039a51170fe941 (diff) | |
| download | ceph-7efbebe20f7372965c81c150e0e3d2c42c18ac4e.tar.gz | |
Merge branch 'next'
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index eeecdbeffc8..1eee4609ec1 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.69], [ceph-devel@vger.kernel.org]) +AC_INIT([ceph], [0.70], [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 ce73472f9eb..4628bb52175 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ceph (0.70-1) stable; urgency=low + + * New upstream release + + -- Gary Lowell <gary.lowell@inktank.com> Fri, 04 Oct 2013 20:11:51 +0000 + ceph (0.69-1) precise; urgency=low * New upstream release |