]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wip-temp'
authorSage Weil <sage@redhat.com>
Fri, 10 Jul 2015 15:35:23 +0000 (11:35 -0400)
committerSage Weil <sage@redhat.com>
Fri, 10 Jul 2015 15:35:23 +0000 (11:35 -0400)
commitb30610c5bc63e7c16c7278c691c23d871eb02a96
tree6136528ad0382924c7189b2870f31c9b5841a3ff
parentd934c1319b9069ff46f6e3ce8b4185d5b1f8ec20
parent557c6530a515cffacbaec439cabff8a079edbf5b
Merge branch 'wip-temp'

Conflicts:
src/osd/ReplicatedPG.cc
src/test/osd/RadosModel.h

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
17 files changed:
src/.gitignore
src/os/FileStore.cc
src/os/FileStore.h
src/os/KeyValueStore.cc
src/os/KeyValueStore.h
src/osd/ECBackend.cc
src/osd/OSD.cc
src/osd/OSD.h
src/osd/PG.cc
src/osd/PG.h
src/osd/ReplicatedBackend.cc
src/osd/ReplicatedPG.cc
src/osd/ReplicatedPG.h
src/osd/osd_types.cc
src/osd/osd_types.h
src/test/objectstore/store_test.cc
src/test/osd/RadosModel.h