Merge branch 'master' into openstack-os-build

crowbar · Mar 1, 2012 · 6fcd3b6 · 6fcd3b6
2 parents c6eec68 + a4edf90
commit 6fcd3b6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/barclamps/ganglia b/barclamps/ganglia
diff --git a/barclamps/nagios b/barclamps/nagios
diff --git a/barclamps/provisioner b/barclamps/provisioner