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: a6a3f50 14e91bf)

author	Sage Weil <sage@inktank.com>
	Wed, 16 Oct 2013 21:13:03 +0000 (14:13 -0700)
committer	Sage Weil <sage@inktank.com>
	Wed, 16 Oct 2013 21:13:03 +0000 (14:13 -0700)
commit	5c476277a61902a002401d1655789a87037bc5ac
tree	bccc17e80dbb0686f84a715ea0086613ac37e694	tree \| snapshot
parent	a6a3f50dceb92dd7c5eb0f6e956e491ed16e94e6	commit \| diff
parent	14e91bf1246eed944adf8bbad627c030654da142	commit \| diff

Merge remote-tracking branch 'gh/next'

ceph.spec.in	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	diff1 \|	diff2 \|	blob \| history
src/mon/MonCommands.h	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_main.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.h	diff1 \|	diff2 \|	blob \| history

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