]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wip-keystone' into wip-rgw-integration
authorYehuda Sadeh <yehuda@inktank.com>
Fri, 9 Nov 2012 01:19:18 +0000 (17:19 -0800)
committerYehuda Sadeh <yehuda@inktank.com>
Fri, 9 Nov 2012 01:19:18 +0000 (17:19 -0800)
commit2475d0143b17ad4470009b62682d0e5845673e8c
tree08f7bba903bd2c247b03b250296079eae607d78f
parente5124ced11e4150bae1b4b9b3fcc30b1deebbcac
parentfc0d6d345320057182adfac85681241c976c944b
Merge branch 'wip-keystone' into wip-rgw-integration

Conflicts:
debian/control

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
debian/control
doc/radosgw/config.rst
src/Makefile.am
src/common/config_opts.h
src/rgw/rgw_common.cc
src/rgw/rgw_common.h
src/rgw/rgw_main.cc
src/rgw/rgw_rest_swift.cc