diff options
| author | Sage Weil <sage@newdream.net> | 2012-02-24 12:54:41 -0800 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2012-02-24 12:54:41 -0800 |
| commit | be761149f5f829d0aa4bfc65891848efc59f7143 (patch) | |
| tree | 121776c580b95208ac649da366727abddcd220c2 | |
| parent | d85ed91cc73ae50d1939b3b424efcc7aa456bb07 (diff) | |
| parent | c3e1291da94fe0861715c0ca34ecc8f02da2a3a6 (diff) | |
| download | ceph-be761149f5f829d0aa4bfc65891848efc59f7143.tar.gz | |
Merge branch 'stable'
| -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 b27d5cef204..5f28aab9276 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ AC_PREREQ(2.59) # NOTE: This version is _only_ used for naming the tarball. The # 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.42], [ceph-devel@vger.kernel.org]) +AC_INIT([ceph], [0.42.1], [ceph-devel@vger.kernel.org]) AC_CONFIG_SUBDIRS([src/gtest]) diff --git a/debian/changelog b/debian/changelog index 065cb206ea9..bee62ae8f52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ceph (0.42.1-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil <sage@newdream.net> Thu, 23 Feb 2012 18:46:23 -0800 + ceph (0.42-1) experimental; urgency=low * New upstream relese |