salt/tests/unit/cloud
rallytime 2edfef33ae Merge branch 'carbon' into 'develop'
Conflicts:
  - salt/scripts.py
  - salt/thorium/key.py
  - tests/unit/cloud/clouds/dimensiondata_test.py
  - tests/unit/cloud/clouds/gce_test.py
2016-09-08 17:31:29 -06:00
..
clouds Merge branch 'carbon' into 'develop' 2016-09-08 17:31:29 -06:00
__init__.py make saltify to use standard boostrap procedure, therefore providing all options like master_sign_pub_file 2015-05-17 18:16:43 +02:00
libcloud_test.py fix clrf 2016-08-15 16:30:58 -06:00