]> 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: f4375d1 6f1dc29)
Merge remote-tracking branch 'origin/master' into wip-stretch-mode
authorGreg Farnum <gfarnum@redhat.com>
Tue, 15 Sep 2020 02:25:07 +0000 (02:25 +0000)
committerGreg Farnum <gfarnum@redhat.com>
Tue, 15 Sep 2020 02:25:07 +0000 (02:25 +0000)
commit9506d09e3b7be75919d70b3408ac95fbe81a7a0d
tree6e2dad5ee276f406acf219d9c7a92d9324335526tree | snapshot
parentf4375d1d0229076c2cabdc75fc3a4d7db84e989acommit | diff
parent6f1dc2994c49254974a25ca5a2b36608449c133dcommit | diff
Merge remote-tracking branch 'origin/master' into wip-stretch-mode

Conflicts:
src/include/ceph_features.h

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
14 files changed:
qa/tasks/ceph.py diff1 | diff2 | blob | history
src/common/options.cc diff1 | diff2 | blob | history
src/crush/CrushWrapper.h diff1 | diff2 | blob | history
src/include/ceph_features.h diff1 | diff2 | blob | history
src/mon/Monitor.cc diff1 | diff2 | blob | history
src/mon/Monitor.h diff1 | diff2 | blob | history
src/mon/OSDMonitor.cc diff1 | diff2 | blob | history
src/mon/Session.h diff1 | diff2 | blob | history
src/msg/Message.cc diff1 | diff2 | blob | history
src/osd/OSDMap.cc diff1 | diff2 | blob | history
src/osd/PeeringState.cc diff1 | diff2 | blob | history
src/osd/PeeringState.h diff1 | diff2 | blob | history
src/osd/osd_types.cc diff1 | diff2 | blob | history
src/osd/osd_types.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.