]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b4a4bc1 9b23392)
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
tree587c7d023d7bc75b877ff2764213663a209222fftree | snapshot
parentb4a4bc140ef3fc2da9986028e5deefdff6b4f141commit | diff
parent9b2339297a58e71752fa1bdc8411f41449bd0446commit | diff
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 diff1 | diff2 | blob | history
src/common/config_opts.h diff1 | diff2 | blob | history
src/include/ceph_features.h diff1 | diff2 | blob | history
src/include/rados.h diff1 | diff2 | blob | history
src/mon/MonCommands.h diff1 | diff2 | blob | history
src/mon/OSDMonitor.cc diff1 | diff2 | blob | history
src/osd/OSD.cc diff1 | diff2 | blob | history
src/osd/OSD.h diff1 | diff2 | blob | history
src/osd/PG.h diff1 | diff2 | blob | history
src/osd/ReplicatedPG.cc diff1 | diff2 | blob | history
src/osd/ReplicatedPG.h diff1 | diff2 | blob | history
src/osd/osd_types.cc diff1 | diff2 | blob | history
src/osd/osd_types.h diff1 | diff2 | blob | history
src/osdc/Objecter.cc diff1 | diff2 | blob | history
src/osdc/Objecter.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.