]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote branch 'origin/master' into wip-osd-op-tracking
authorGreg Farnum <gregory.farnum@dreamhost.com>
Thu, 2 Feb 2012 00:05:32 +0000 (16:05 -0800)
committerGreg Farnum <gregory.farnum@dreamhost.com>
Thu, 2 Feb 2012 00:05:32 +0000 (16:05 -0800)
commit8870a6762fa28d241f885f7dd3fd0c84015f287f
tree4ec515271fe2358cf1e6b9fa82415c904f87bcf5
parent71c59dae27b0044a28feed171670cfefd2ccbcf1
parent3353f572f84707fbc0e99a9af2dc48de2d0aa2c9
Merge remote branch 'origin/master' into wip-osd-op-tracking

Conflicts:
src/osd/ReplicatedPG.h
src/Makefile.am
src/common/config_opts.h
src/osd/OSD.cc
src/osd/OSD.h
src/osd/PG.cc
src/osd/PG.h
src/osd/ReplicatedPG.cc
src/osd/ReplicatedPG.h