]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'origin/wip-9113' into wip-sam-firefly-backports
authorSamuel Just <sam.just@inktank.com>
Thu, 30 Oct 2014 20:47:22 +0000 (13:47 -0700)
committerSamuel Just <sam.just@inktank.com>
Thu, 30 Oct 2014 20:47:22 +0000 (13:47 -0700)
commit5df09fa1b5a42992f9e41aca09e86db0d03d9fbd
tree170ee5936ca1031221cc3073333c963079481b41
parenta0937ef214b9221e7a5e69e7b0f0697471d56293
parenta1aa06b7fb30e509193e1b1bb7355b5f21aedc82
Merge remote-tracking branch 'origin/wip-9113' into wip-sam-firefly-backports
src/common/config_opts.h
src/osd/ReplicatedPG.cc
src/osd/ReplicatedPG.h