From: Yehuda Sadeh Date: Mon, 15 Jul 2013 18:17:03 +0000 (-0700) Subject: Merge remote-tracking branch 'origin/wip-rgw-warnings' into next X-Git-Tag: v0.67-rc1~71^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1b5258155ab2de7b7bc565eafdacf69b79e1bc08;p=ceph.git Merge remote-tracking branch 'origin/wip-rgw-warnings' into next Conflicts: src/test/test_rgw_admin_log.cc src/test/test_rgw_admin_meta.cc src/test/test_rgw_admin_opstate.cc Reviewed-by: Yehuda Sadeh --- 1b5258155ab2de7b7bc565eafdacf69b79e1bc08