Merge branch 'bug/217/emilien' of github.com:enovance/puppet-cloud into bug/217/emilien

Browse Source

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>

Conflicts:
	spec/classes/cloud_compute_hypervisor_spec.rb

...

This commit is contained in:

Emilien Macchi 2014-02-11 19:33:57 +01:00

parent fdbf342b53 1fb892a9ff

commit 55d6ad3ccc

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available