git.apps.os.sepia.ceph.com Git - ceph.git/commit

]> git.apps.os.sepia.ceph.com Git - ceph.git/commit

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f7c5d1a 3fc6cfb)

author	Gregory Farnum <greg@inktank.com>
	Mon, 7 Oct 2013 15:56:46 +0000 (08:56 -0700)
committer	Gregory Farnum <greg@inktank.com>
	Mon, 7 Oct 2013 15:56:46 +0000 (08:56 -0700)
commit	13b80bb446fbc6c8a78635e666b4e24392cb171e
tree	789a4942e29a22602c5cf60960e8bf28d8f77df4	tree \| snapshot
parent	f7c5d1ac94ca3002b09fa178c44a8701ffe71281	commit \| diff
parent	3fc6cfbb23c1e7413776e331d1cc5196b32d3709	commit \| diff

Merge pull request #610 from ceph/wip-optracker

Reviewed-by: Samuel Just <sam.just@inktank.com>

src/osd/PG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedBackend.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	diff1 \|	diff2 \|	blob \| history
src/test/encoding/types.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.