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: c55f8d4 2813150)

author	Sage Weil <sage@redhat.com>
	Fri, 16 Oct 2015 13:49:09 +0000 (09:49 -0400)
committer	Sage Weil <sage@redhat.com>
	Fri, 16 Oct 2015 13:49:09 +0000 (09:49 -0400)
commit	63d868106efd4d8aef71d498ba84cb2271a95a07
tree	0368a4768eed28093515dd5ae75ed1c9b190a869	tree \| snapshot
parent	c55f8d4300019bf2da1fe52edb0c2151cc8e3d2e	commit \| diff
parent	28131505b84f866cdaece84295b74f5c27160647	commit \| diff

Merge remote-tracking branch 'gh/infernalis'

src/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history
src/test/Makefile-client.am	diff1 \|	diff2 \|	blob \| history

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