]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commit41a245aff77dde8a2ab212f9c91a73a23a77c40d
tree3afe4c2e2eac5a612905067583acb3afc03b3b1b
parent95cefea9fd9ab740263bf8bb4796fd864d9afe2b
parent65b380f7f28a36bb51a6771a2fd9b657ea2848ba
Merge remote-tracking branch 'gh/wip-12536-hammer' into hammer

This includes wip-osd-compat-hammer.