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

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

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 00ae543 5faa4ac)

author	Sage Weil <sage@inktank.com>
	Tue, 9 Jul 2013 22:34:05 +0000 (15:34 -0700)
committer	Sage Weil <sage@inktank.com>
	Tue, 9 Jul 2013 22:34:05 +0000 (15:34 -0700)
commit	aa7448cd1794858896f3c26606362827f267b11c
tree	9bb9e560e51aecde26d9f2367ca6c5c7da8d8f07	tree \| snapshot
parent	00ae543b3e32f89d906a0e934792cc5309f57696	commit \| diff
parent	5faa4ac1e5b06de21aa976ed91082f5762c441ae	commit \| diff

Merge pull request #415 from ceph/rgw-next

configure.ac	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	diff1 \|	diff2 \|	blob \| history

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