diff options
| author | mdietz <mdietz@openstack> | 2010-10-05 19:37:15 +0000 |
|---|---|---|
| committer | mdietz <mdietz@openstack> | 2010-10-05 19:37:15 +0000 |
| commit | cde00c93345147f724ccb1686393e866fe732446 (patch) | |
| tree | 8f229f4d7ab4dcb9f52edc879f3ea00d7e6e2006 /bin/stack | |
| parent | 6bdbb567f1a9e0a8b980ff916183d47375fe11bf (diff) | |
| parent | f0db8b74ec894631fe29c2a33748b797758ecf50 (diff) | |
| download | nova-cde00c93345147f724ccb1686393e866fe732446.tar.gz nova-cde00c93345147f724ccb1686393e866fe732446.tar.xz nova-cde00c93345147f724ccb1686393e866fe732446.zip | |
Merge from trunk and conflict resolution
Diffstat (limited to 'bin/stack')
0 files changed, 0 insertions, 0 deletions