summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--config/cloud.cfg1
2 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index bdba748e..45af41ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,7 @@
- add support for adding and deleting CA Certificates [Mike Milner] (LP: #915232)
- in ci-info lines, use '.' to indicate empty field for easier machine reading
- support empty lines in "#include" files (LP: #923043)
+ - support configuration of salt minions (Jeff Bauer) (LP: #927795)
0.6.2:
- fix bug where update was not done unless update was explicitly set.
It would not be run if 'upgrade' or packages were set to be installed
diff --git a/config/cloud.cfg b/config/cloud.cfg
index 25d02cee..4eab2a36 100644
--- a/config/cloud.cfg
+++ b/config/cloud.cfg
@@ -24,6 +24,7 @@ cloud_config_modules:
- timezone
- puppet
- chef
+ - salt
- mcollective
- disable-ec2-metadata
- runcmd