summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorGary Lowell <gary.lowell@inktank.com>2012-11-14 02:29:47 +0100
committerGary Lowell <gary.lowell@inktank.com>2012-11-14 02:29:47 +0100
commit7926ef53935313501d4a7fe0e587f3e3b00b313c (patch)
treee2696454c53ccc53e3af0ee54b16c73632af3fac /debian
parentosd/: add config helper for min_size and update build_simple* (diff)
parentv0.54 (diff)
downloadceph-7926ef53935313501d4a7fe0e587f3e3b00b313c.tar.xz
ceph-7926ef53935313501d4a7fe0e587f3e3b00b313c.zip
Merge branch 'next'
Conflicts: configure.ac src/rgw/rgw_common.cc
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
1 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 35c16a5741a..d4973ec4363 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ceph (0.54-1) precise; urgency=low
+
+ * New upstream release
+
+ -- Gary Lowell <gary.lowell@inktank.com> Tue, 13 Nov 2012 13:17:19 -0800
+
ceph (0.53-1) precise; urgency=low
* New upstream release