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: 7515b05 b44092f)

author	Sage Weil <sage@inktank.com>
	Thu, 14 Jun 2012 22:17:03 +0000 (15:17 -0700)
committer	Sage Weil <sage@inktank.com>
	Thu, 14 Jun 2012 22:17:03 +0000 (15:17 -0700)

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

Simple merge

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