Merge remote-tracking branch 'origin/next'
authorYehuda Sadeh <yehuda@redhat.com>
Mon, 2 Feb 2015 17:33:03 +0000 (09:33 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Mon, 2 Feb 2015 17:33:03 +0000 (09:33 -0800)
commitdd5b1dc213f9ea237bf51f6129e92ec9c8e2e4ee
tree2d425f4c5a5953e983445b49fcf2ca3e3fe332ed
parentba1ea157d7a37aff4f0f7cece7eb27566b5cfecb
parente143ff7dcadc8a55c48fc8643977285077c3066e
Merge remote-tracking branch 'origin/next'

Conflicts:
src/rgw/rgw_op.cc
src/rgw/rgw_rados.cc
src/rgw/rgw_rados.h
src/rgw/rgw_main.cc
src/rgw/rgw_op.cc
src/rgw/rgw_rados.cc
src/rgw/rgw_rados.h
src/rgw/rgw_rest.cc
src/rgw/rgw_rest_s3.cc