summaryrefslogtreecommitdiffstats
path: root/bin/stack
diff options
context:
space:
mode:
authorDan Wendlandt <dan@nicira.com>2011-08-12 17:33:30 -0700
committerDan Wendlandt <dan@nicira.com>2011-08-12 17:33:30 -0700
commit86d2109b8f3b27e460aa41c11924166cb07d7bb4 (patch)
tree99b79011748fc0b67df507db103779237caa40a9 /bin/stack
parent18f09f165b5dca5f11253b143045b2ff7327532d (diff)
parentfe0bde67193ce76376e72a7263b89240a63722a8 (diff)
downloadnova-86d2109b8f3b27e460aa41c11924166cb07d7bb4.tar.gz
nova-86d2109b8f3b27e460aa41c11924166cb07d7bb4.tar.xz
nova-86d2109b8f3b27e460aa41c11924166cb07d7bb4.zip
merge in trunk, resolving conflicts with ttx's branch to switch from using sudo to run_as_root=True
Diffstat (limited to 'bin/stack')
0 files changed, 0 insertions, 0 deletions