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: ea0e0c7 93f2794)

author	Sage Weil <sage@inktank.com>
	Sat, 11 May 2013 00:13:12 +0000 (17:13 -0700)
committer	Sage Weil <sage@inktank.com>
	Sat, 11 May 2013 00:13:12 +0000 (17:13 -0700)

Reviewed-by: Sage Weil <sage@inktank.com>

		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

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