]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'upstream/wip-11493'
authorSamuel Just <sjust@redhat.com>
Fri, 29 May 2015 21:17:42 +0000 (14:17 -0700)
committerSamuel Just <sjust@redhat.com>
Fri, 29 May 2015 21:17:42 +0000 (14:17 -0700)
commit8a95f13a69397bc2c8ee7dbf13da99c9998ad7d2
tree2cd096ee39f156f664d88e58c559e56c828afca9
parent315260a58c64585b3236cf1b8fc199f1aed87e49
parent11b7801bb57cb25cd2d26d58722d49691747725b
Merge remote-tracking branch 'upstream/wip-11493'

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
qa/workunits/cephtool/test.sh
src/mon/OSDMonitor.cc