Merge remote-tracking branch 'origin/openstack-os-build' into opensta…

…ck-os-build
zehicle · May 26, 2012 · 577219b · 577219b
2 parents a6dc5fd + d7b3820
commit 577219b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/barclamps/crowbar b/barclamps/crowbar
diff --git a/barclamps/deployer b/barclamps/deployer
diff --git a/barclamps/network b/barclamps/network