Merge branch 'next'

This commit is contained in:
Gary Lowell 2013-04-01 17:57:45 -07:00
commit 6ffadce67e
2 changed files with 7 additions and 1 deletions

View File

@ -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.59], [ceph-devel@vger.kernel.org])
AC_INIT([ceph], [0.60], [ceph-devel@vger.kernel.org])
# Create release string. Used with VERSION for RPMs.
RPM_RELEASE=0

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
ceph (0.60-1) precise; urgency=low
* New upstream release
-- Gary Lowell <gary.lowell@inktank.com> Mon, 01 Apr 2013 12:22:30 -0700
ceph (0.59-1) precise; urgency=low
* New upstream release