summaryrefslogtreecommitdiffstats
path: root/bin/stack
diff options
context:
space:
mode:
authorBrian Waldon <brian.waldon@rackspace.com>2011-05-02 16:27:58 -0400
committerBrian Waldon <brian.waldon@rackspace.com>2011-05-02 16:27:58 -0400
commit8d9e8ea5ddfaa2ca9e405960654ee6f6b0bab8bb (patch)
tree31bf1b04ae967021a76c0e4f2c3389eee5682b3a /bin/stack
parent89d818c621cf257495ceb07687be04152423086a (diff)
parent65f05c403e852cebeb7b052e36bbd129aedf4d4f (diff)
downloadnova-8d9e8ea5ddfaa2ca9e405960654ee6f6b0bab8bb.tar.gz
nova-8d9e8ea5ddfaa2ca9e405960654ee6f6b0bab8bb.tar.xz
nova-8d9e8ea5ddfaa2ca9e405960654ee6f6b0bab8bb.zip
merging trunk; resolving conflicts; fixing issue with ApiError test failing since r1043
Diffstat (limited to 'bin/stack')
0 files changed, 0 insertions, 0 deletions