[python-keystoneclient/el6-havana: 2/2] Merge branch 'master' into el6-havana

[Jakub Ruzicka]

commit 7bfceb5cbb39d465efb45c11b7a9097302c35cbc
Merge: 3551457 ae8b603
Author: Jakub Ruzicka <jruzicka at redhat.com>
Date:   Tue Jun 25 22:08:14 2013 +0200

    Merge branch 'master' into el6-havana

 0001-Remove-runtime-dependency-on-python-pbr.patch |   22 ++++++++++++++
 ...ch => 0002-Add-find-method-to-CrudManager.patch |    2 +-
 ...oneclient-to-work-with-older-keystone-ins.patch |    2 +-
 ...l-keyring-support-add-basic-keyring-tests.patch |    2 +-
 ...0005-Cleanup-shell-s-authentication-check.patch |    2 +-
 ...tch => 0006-Provide-keystone-CLI-man-page.patch |    2 +-
 ...> 0007-Use-AuthRef-for-some-client-fields.patch |    2 +-
 ...> 0008-Fix-memcache-encryption-middleware.patch |    2 +-
 ...ache-config-entry-name-in-Keystone-to-be-.patch |    2 +-
 ...t.patch => 0010-Implements-v3-auth-client.patch |    2 +-
 ...6-compatibility-for-tests-test_keyring.py.patch |    2 +-
 python-keystoneclient.spec                         |   31 ++++++++++++-------
 12 files changed, 51 insertions(+), 22 deletions(-)
---