]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-12536-hammer' into hammer
authorSage Weil <sage@redhat.com>
Thu, 27 Aug 2015 17:07:29 +0000 (13:07 -0400)
committerSage Weil <sage@redhat.com>
Thu, 27 Aug 2015 17:07:29 +0000 (13:07 -0400)
This includes wip-osd-compat-hammer.


Trivial merge