]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'gh/wip-osd-compat-hammer' into wip-12536-hammer
authorSage Weil <sage@redhat.com>
Wed, 19 Aug 2015 13:52:02 +0000 (09:52 -0400)
committerSage Weil <sage@redhat.com>
Wed, 19 Aug 2015 13:52:02 +0000 (09:52 -0400)
commit65b380f7f28a36bb51a6771a2fd9b657ea2848ba
treebc8f80d45a5926491a282193d63aac51a6f5fb3f
parent00d802d97ba5e1a8bde2414f8710494f15807fcd
parent9b91adc560c8dffc1f5f7470d28c25f448b2b619
Merge remote-tracking branch 'gh/wip-osd-compat-hammer' into wip-12536-hammer
src/mon/OSDMonitor.cc