Emilien Macchi 333cdb5695 Merge branch 'master' into icehouse-support ...

Conflicts:
	CHANGELOG.md
	manifests/loadbalancer.pp
	spec/classes/cloud_compute_hypervisor_spec.rb

2014-05-06 09:46:12 +02:00

..

api.pp

Merge branch 'master' into icehouse-support

2014-05-06 09:46:12 +02:00

registry.pp

default values: rebase after splitting

2014-04-24 11:03:29 -04:00