summaryrefslogtreecommitdiffstats
path: root/bin/stack
diff options
context:
space:
mode:
authorRyan Lane <laner@controller>2010-12-22 23:47:31 +0000
committerRyan Lane <laner@controller>2010-12-22 23:47:31 +0000
commit5012ccb22724c2f7fb0fcdcb7b146d5d5e61337d (patch)
tree3d44d084647c86c41cc189d3a8bf8bcdedba3ef7 /bin/stack
parente893be0a8d32cf1eb2c91187b81a6febf90e5b7c (diff)
parent3f37287c1adfe35756c58938ea8d826181bad2e2 (diff)
downloadnova-5012ccb22724c2f7fb0fcdcb7b146d5d5e61337d.tar.gz
nova-5012ccb22724c2f7fb0fcdcb7b146d5d5e61337d.tar.xz
nova-5012ccb22724c2f7fb0fcdcb7b146d5d5e61337d.zip
Merge from trunk, and resolve conflict with nova/auth/ldapdriver.py
Diffstat (limited to 'bin/stack')
0 files changed, 0 insertions, 0 deletions