summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2012-05-20 21:18:36 -0700
committerSage Weil <sage@newdream.net>2012-05-20 21:18:36 -0700
commitd8f4c6d20877f7f710664f5344f18f641d63c649 (patch)
treeeca2bf0a4faedd1c56232877f847e726e66af02b /debian
parent31102d317d7a091f49f9126a6df9087cde0d8118 (diff)
parentad663d58c891dfa74ff6d4d653345358be98ffd7 (diff)
downloadceph-d8f4c6d20877f7f710664f5344f18f641d63c649.tar.gz
Merge branch 'stable'
Conflicts: src/os/FileStore.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 4e6c37cc0ee..2f34e20ce65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ceph (0.47-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Sage Weil <sage@newdream.net> Sun, 20 May 2012 15:16:03 -0700
+
ceph (0.46-1) experimental; urgency=low
* New upstream release