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: e1fc96f fb7d5a3)

author	Sage Weil <sage@redhat.com>
	Fri, 11 Jul 2014 21:56:40 +0000 (14:56 -0700)
committer	Sage Weil <sage@redhat.com>
	Fri, 11 Jul 2014 21:56:40 +0000 (14:56 -0700)
commit	49e5c8ec88eab095c1e271fc48a807573aff9f04
tree	11bdeebe837a217db611796f1b2c4b480a9dd653	tree \| snapshot
parent	e1fc96f713eeb1fbbef4d2286b367f40d4f374a9	commit \| diff
parent	fb7d5a3a756bd54f469a7ab2fe0e660b4f0d3f4a	commit \| diff

Merge remote-tracking branch 'gh/next'

src/osd/ECBackend.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ECBackend.h	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	diff1 \|	diff2 \|	blob \| history
src/osd/PGBackend.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PGBackend.h	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedBackend.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedBackend.h	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.h	diff1 \|	diff2 \|	blob \| history

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