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

]> git.apps.os.sepia.ceph.com Git - ceph.git/commit

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: cdc178f deded44)

author	Sage Weil <sage@inktank.com>
	Fri, 20 Dec 2013 21:41:58 +0000 (13:41 -0800)
committer	Sage Weil <sage@inktank.com>
	Fri, 20 Dec 2013 21:41:58 +0000 (13:41 -0800)
commit	7bacc413f3f6d8cfce3ea7f7510200bd03854767
tree	43548224539fbcc8611d764d480e7dd428675508	tree \| snapshot
parent	cdc178fb9b82eb931c7d80a605668425b02d4f21	commit \| diff
parent	deded4465cad3cb36487ab36c4fe89bbc8b2efd4	commit \| diff

Merge pull request #818 from ceph/wip-rgw-standalone-2

Wip rgw standalone 2

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

src/common/config_opts.h	diff1 \|	diff2 \|	blob \| history
src/rgw/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_common.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_common.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_env.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_main.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.cc	diff1 \|	diff2 \|	blob \| history

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