Colton Myers
5fcbcfe6d5
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/cloud/digitalocean.rst
doc/topics/tutorials/index.rst
salt/cloud/clouds/digital_ocean.py
salt/modules/lxc.py
salt/returners/__init__.py
2015-05-29 17:33:28 -06:00
Mathieu Le Marec - Pasquet
458f50617b
seed: lint
...
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-24 14:50:24 +02:00
Mathieu Le Marec - Pasquet
96b8d55f14
Fix seed.mkconfig yamldump
...
This fixes #24071
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-24 14:07:07 +02:00
Colton Myers
9b2f27b87f
Remove unused mock_open
2015-05-11 15:52:24 -06:00
Colton Myers
3c51d36599
Remove tests.unit.modules.seed_test.test_mkconfig
...
Was creating False.pem and False.pub files, and wasn't compatible with
new crypt.py changes. Should be rewritten as a proper, destructive,
integration test.
2015-05-11 15:11:58 -06:00
Jayesh Kariya
3f134bc573
adding seed unit test case
2015-05-08 16:10:00 +05:30
