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: 49e5c8e 59c00e5)

author	Sage Weil <sage@inktank.com>
	Fri, 11 Jul 2014 21:59:19 +0000 (14:59 -0700)
committer	Sage Weil <sage@inktank.com>
	Fri, 11 Jul 2014 21:59:19 +0000 (14:59 -0700)
commit	636a899fe06ffc88fdd78b6d460fe0de660228a0
tree	ee00bfaab516c54c67ebf54092c2018f98331357	tree \| snapshot
parent	49e5c8ec88eab095c1e271fc48a807573aff9f04	commit \| diff
parent	59c00e5fd06c0ea012b6d93dd6abf8629298711d	commit \| diff

Merge pull request #2091 from ceph/wip-kinetic-os

prototype kinetic osd backend

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

src/rgw/rgw_civetweb.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_fcgi.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_main.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_client.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_conn.cc	diff1 \|	diff2 \|	blob \| history

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