Merge branch 'bug/56/spredzy' of github.com:enovance/puppet-cloud into bug/56/spredzy

Browse Source

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

Conflicts:
	manifests/database/nosql.pp

...

This commit is contained in:

Emilien Macchi

2014-02-24 16:40:20 +01:00

parent 95df7cbb58 a75f29bf62

commit b566b79448

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

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

Diff Content Not Available