]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a722fb7 6d3e13f)
Merge remote-tracking branch 'origin/wip-rgw-warnings' into next
authorYehuda Sadeh <yehuda@inktank.com>
Mon, 15 Jul 2013 18:17:03 +0000 (11:17 -0700)
committerYehuda Sadeh <yehuda@inktank.com>
Mon, 15 Jul 2013 18:17:03 +0000 (11:17 -0700)
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 <yehuda@inktank.com>
1  2 
src/test/test_rgw_admin_opstate.cc patch | diff1 | diff2 | blob | history

diff --cc src/test/test_rgw_admin_opstate.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.