]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'origin/master' into wip-stretch-mode
authorGreg Farnum <gfarnum@redhat.com>
Mon, 14 Sep 2020 02:32:19 +0000 (02:32 +0000)
committerGreg Farnum <gfarnum@redhat.com>
Mon, 14 Sep 2020 02:32:19 +0000 (02:32 +0000)
commitd02625331c4e06ca213d9720d98137d83a87cb90
tree086924476a2e50f6efb74e911b1aae2ca0643532
parent0a86fe281d1382db11f2d6543d6cd3185bce1338
parente4e6e9c7383959c7c6e1540d9bdbcf88e7825e7b
Merge remote-tracking branch 'origin/master' into wip-stretch-mode
22 files changed:
qa/tasks/ceph.py
qa/workunits/cephtool/test.sh
src/common/options.cc
src/crush/CrushWrapper.h
src/mon/MgrStatMonitor.cc
src/mon/MonCommands.h
src/mon/MonMap.cc
src/mon/MonMap.h
src/mon/MonOpRequest.h
src/mon/Monitor.cc
src/mon/OSDMonitor.cc
src/mon/OSDMonitor.h
src/msg/Message.cc
src/msg/Message.h
src/osd/OSDMap.cc
src/osd/OSDMap.h
src/osd/PeeringState.cc
src/osd/PeeringState.h
src/osd/osd_types.cc
src/osd/osd_types.h
src/osdc/Objecter.cc
src/osdc/Objecter.h