]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'origin/wip-sam-proxy-write'
authorSamuel Just <sjust@redhat.com>
Wed, 19 Aug 2015 22:49:40 +0000 (15:49 -0700)
committerSamuel Just <sjust@redhat.com>
Wed, 19 Aug 2015 23:07:30 +0000 (16:07 -0700)
commitafb4db73cceea1adb72c3d434c7da4042de2301f
tree587c7d023d7bc75b877ff2764213663a209222ff
parentb4a4bc140ef3fc2da9986028e5deefdff6b4f141
parent9b2339297a58e71752fa1bdc8411f41449bd0446
Merge remote-tracking branch 'origin/wip-sam-proxy-write'

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Conflicts:
src/include/ceph_features.h
src/osd/ReplicatedPG.cc
src/osd/ReplicatedPG.h
15 files changed:
qa/workunits/cephtool/test.sh
src/common/config_opts.h
src/include/ceph_features.h
src/include/rados.h
src/mon/MonCommands.h
src/mon/OSDMonitor.cc
src/osd/OSD.cc
src/osd/OSD.h
src/osd/PG.h
src/osd/ReplicatedPG.cc
src/osd/ReplicatedPG.h
src/osd/osd_types.cc
src/osd/osd_types.h
src/osdc/Objecter.cc
src/osdc/Objecter.h