Fix for configuring non-default auth plugins properly

Make sure we pick up CONF.auth.methods from configuration
files. Added a test case to make sure the we don't regress

Fixes LP# 1157515

Change-Id: I70290c37b2a5378b5247a14e3bfa20d50bf8fe74
Use is_enabled() in folsom->grizzly upgrade (bug 1167421)

Change-Id: Iddc10167c94deacec07cab7ec9316849263fb462
Merge "Fix for configuring non-default auth plugins properly" into stable/grizzly
Mark LDAP password and admin_token secret

Add secret=True to LDAP password and admin_token
of keystone configuration.

Fix bug #1172195

Change-Id: I8ef7f705e3f6b374ff427c20eb761892d5146a75
(cherry picked from commit d43e2a51a1ed7adbed3c5ddf001d46bc4a824ae8)
Fix token ids for memcached

Bug 1119641

Change-Id: Ia22764acc69a272b37364193d10c553a48679b9a
(cherry picked from commit a62d3afae43ebe191fe86f8d1ebed3e8bfaeba17)
residual grants after delete action (bug1125637)

remove all applicable grants when role is deleted
(sql/kvs solution only)

Fixes: bug #1125637

Change-Id: I3a958c6d56739e37a95f6c713fab154827e9ceca
(cherry picked from commit e16742bdf2f1fa7386f2983b037a78fde4a576c3)
Merge "residual grants after delete action (bug1125637)" into stable/grizzly
Merge "Mark LDAP password and admin_token secret" into stable/grizzly
Set defaultbranch in .gitreview to stable/grizzly

This allows people run git-review without any arguments.

Change-Id: I2b2488ffffd783b64e5c760324e7d4a00d5a39db
Skip IPv6 tests for eventlet dns

Eventlet address resolving doesn't support IPv6. This is causing the
gate to fail.

The failure happens when the dnspython package is installed in the
environment. When dnspython is there then eventlet takes over
getaddrinfo, and eventlet's getaddrinfo doesn't support IPv6. If
dnspython isn't there, then the eventlet patching doesn't happen
and IPv6 address resolution works.

It appears that the pip dependencies have recently been updated
so that dnspython gets installed now.

The fix is to skip the 3 tests that force the server to listen
on "::1".

Fixes bug 1176204

Once eventlet is updated, we can add the tests back in. Here's the
eventlet code in question:

https://bitbucket.org/eventlet/eventlet/src/e0f578180d7d82d2ed3d8a96d520103503c524ec/eventlet/support/greendns.py?at=0.12#cl-166

Change-Id: Ib7a5a5f0dcac82229b7b7fb3df4b1ef141586c5f
Revoke tokens on user delete (bug 1166670)

Change-Id: Id8a2972c9adb572ef9d2b7f03bcf07a8de5614ab
Bump stable/grizzly next version to 2013.1.2

Change-Id: I130528ae946e8888d35c25e468b4ea6ac29db0cf
use swift stable branch

Change-Id: I073b802d18b80d3687c519b5d044c1d20493d88c
Merge "use swift stable branch" into stable/grizzly