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

projects / ceph.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 961cd0e 4ada7cc)

author	Sage Weil <sage@redhat.com>
	Tue, 3 Feb 2015 08:12:17 +0000 (00:12 -0800)
committer	Sage Weil <sage@redhat.com>
	Tue, 3 Feb 2015 08:12:17 +0000 (00:12 -0800)

		1	2
src/rgw/rgw_main.cc	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

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