Merge remote-tracking branch 'origin/master' into wip-rgw-versioning-4
authorYehuda Sadeh <yehuda@redhat.com>
Fri, 30 Jan 2015 00:05:14 +0000 (16:05 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Fri, 30 Jan 2015 00:05:14 +0000 (16:05 -0800)
commitf147143115a9a5de21ebf954526b2c56f883d002
treea7d2a2b3f7b3ad5d8b57e98fae6a9cf3240e555d
parentca71376c8362a784645702e4cae440026c4f756f
parent243860b5e413c23ea642d368a8f771e6c484d1eb
Merge remote-tracking branch 'origin/master' into wip-rgw-versioning-4

Conflicts:
src/rgw/rgw_admin.cc
14 files changed:
src/common/config_opts.h
src/osd/ReplicatedPG.cc
src/rgw/rgw_admin.cc
src/rgw/rgw_bucket.cc
src/rgw/rgw_common.cc
src/rgw/rgw_common.h
src/rgw/rgw_json_enc.cc
src/rgw/rgw_main.cc
src/rgw/rgw_rados.h
src/rgw/rgw_rest.cc
src/rgw/rgw_rest.h
src/rgw/rgw_rest_replica_log.cc
src/rgw/rgw_rest_s3.cc
src/test/encoding/types.h