]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wip-rgw-versionchecks' into next
authorGreg Farnum <greg@inktank.com>
Fri, 26 Jul 2013 20:03:01 +0000 (13:03 -0700)
committerGreg Farnum <greg@inktank.com>
Fri, 26 Jul 2013 20:03:01 +0000 (13:03 -0700)
commit2a1aea7c7f0a8065a8e06c7ea04359e3fe37e8f5
tree375a290c6e0708639db968e14f002bb98ad71d3b
parent4aeb73a5e6d46f970dbd684a58f795d379a04bd9
parent063c71f0ff92316620998b3d08932bd53cbd4f28
Merge branch 'wip-rgw-versionchecks' into next

Conflicts:
src/rgw/rgw_rest_metadata.h

Reviewed-by: Yehuda Sadeh <yehuda@inktank.com
src/rgw/rgw_admin.cc
src/rgw/rgw_bucket.cc
src/rgw/rgw_common.h
src/rgw/rgw_metadata.cc
src/rgw/rgw_metadata.h
src/rgw/rgw_rest_metadata.cc
src/rgw/rgw_rest_metadata.h