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

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

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: da159f8 31eb533)

author	Sage Weil <sage@inktank.com>
	Fri, 14 Mar 2014 18:42:30 +0000 (11:42 -0700)
committer	Sage Weil <sage@inktank.com>
	Fri, 14 Mar 2014 18:42:30 +0000 (11:42 -0700)
commit	5873b0f03ce80c9b6bb0699590eaf36ec6761b75
tree	e83df048b58556523ba5eb46a5c16adc46007cec	tree \| snapshot
parent	da159f8cedebff2a4fe467b313925833e1140858	commit \| diff
parent	31eb533b980d5c7a01585d5875061ee8cb8f54ee	commit \| diff

Merge remote-tracking branch 'gh/wip-da-SCA-firefly-20140304'

Reviewed-by: Sage Weil <sage@inktank.com>

src/os/KeyValueStore.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ECBackend.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	diff1 \|	diff2 \|	blob \| history

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