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

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

projects / ceph.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e7cba7 e4d0aea)

author	Sage Weil <sage@inktank.com>
	Tue, 11 Dec 2012 01:08:26 +0000 (17:08 -0800)
committer	Sage Weil <sage@inktank.com>
	Tue, 11 Dec 2012 01:08:26 +0000 (17:08 -0800)

		1	2
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

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