]> git-server-git.apps.pok.os.sepia.ceph.com Git - radosgw-agent.git/commit
Merge remote-tracking branch 'origin/wip-10015' into wip-boto wip-testing
authorJosh Durgin <jdurgin@redhat.com>
Sat, 6 Dec 2014 05:20:03 +0000 (21:20 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Sat, 6 Dec 2014 05:20:03 +0000 (21:20 -0800)
commitc3ef6d6f86cb3b8dcded986b3dcc0c338d856a49
tree953d7ecd98b93d95b1fe8ea2a608a2fafe6325ba
parentcb9919b4a882ef9b681cf009ab5943bbf8c33a88
parente508070bf3de97f83d27ccc4c4c70ec487a9ef2a
Merge remote-tracking branch 'origin/wip-10015' into wip-boto

Conflicts:
radosgw_agent/tests/test_client.py
radosgw_agent/client.py
radosgw_agent/tests/test_client.py