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: 9ff69f6 055c0c4)

author	Sage Weil <sage@redhat.com>
	Wed, 27 May 2015 21:25:28 +0000 (17:25 -0400)
committer	Sage Weil <sage@redhat.com>
	Wed, 27 May 2015 21:25:28 +0000 (17:25 -0400)
commit	c6f62f518f79341a345aadf81c9659ab8157206e
tree	bda79c8697bde0e12990d8d70976265a5aeff321	tree \| snapshot
parent	9ff69f6498de673ad02fb79445a9157e5524a5d2	commit \| diff
parent	055c0c480e668581df421ebedc0c6e8f23e2aa0b	commit \| diff

Merge remote-tracking branch 'gh/next'

SubmittingPatches	diff1 \|	diff2 \|	blob \| history
ceph.spec.in	diff1 \|	diff2 \|	blob \| history
debian/control	diff1 \|	diff2 \|	blob \| history
src/crush/CrushWrapper.cc	diff1 \|	diff2 \|	blob \| history
src/crush/CrushWrapper.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.cc	diff1 \|	diff2 \|	blob \| history

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