]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'gh/giant'
authorSage Weil <sage@redhat.com>
Mon, 29 Sep 2014 23:17:15 +0000 (16:17 -0700)
committerSage Weil <sage@redhat.com>
Mon, 29 Sep 2014 23:17:15 +0000 (16:17 -0700)
commitf36e8540d0329cba08d0545872798ac1a33c1519
treed13d8ea55df9fa394760c72c3eca541837cb8205
parent9d2481c7ea642c79beb187e3d0242e4d3b798a51
parent0d1a4171c158485df71b884bf0c76f7801b11a33
Merge remote-tracking branch 'gh/giant'

Conflicts:
qa/workunits/cephtool/test.sh
src/test/erasure-code/TestErasureCodeIsa.cc
qa/workunits/cephtool/test.sh
src/common/config_opts.h
src/msg/Pipe.cc
src/msg/Pipe.h
src/osd/PG.cc
src/osd/ReplicatedPG.cc