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: 5d27f3d 1ba969b)

author	Sage Weil <sage@inktank.com>
	Tue, 13 Nov 2012 22:50:42 +0000 (14:50 -0800)
committer	Sage Weil <sage@inktank.com>
	Tue, 13 Nov 2012 22:50:42 +0000 (14:50 -0800)
commit	6a8a59c5d00495be03db708953b7a8b5c55b8233
tree	b33d9740fa5df742b99c6e332961a0761dd48b8a	tree \| snapshot
parent	5d27f3da654b2d1b3f90a5758fc47b89f012a8d2	commit \| diff
parent	1ba969b18000aa0150410860b8305db2d5679e7e	commit \| diff

Merge remote-tracking branch 'gh/wip-rgw-integration'

Conflicts:
src/common/config_opts.h

src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_s3.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_s3.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_swift.cc	diff1 \|	diff2 \|	blob \| history

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