Commit Graph

7 Commits

Author SHA1 Message Date
rallytime
8d3957f250 Merge branch 'carbon' into 'develop'
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/boto_ec2.py
  - salt/modules/cmdmod.py
  - salt/modules/win_lgpo.py
2016-10-28 11:58:41 -06:00
rallytime
e4dc059959 Update Carbon versionadded tags to 2016.11.0 in tests/* 2016-10-27 10:04:13 -06:00
Moe
3c264528fb Expand/improve win_iis_test tests (#36053)
* Expand win_iis_test tests

* Fix linting issue
2016-09-06 10:47:28 -06:00
Mike Place
f3334126b4 Lint IIS test 2016-08-30 22:50:36 +09:00
mwinnett
f48ebd082f DRY, additional win_iis unit tests 2016-08-28 23:42:53 -07:00
Morrie Winnett
c14ef8bde8 Add list_apps, list_bindings, remove_site tests 2016-08-11 09:12:52 -07:00
Morrie Winnett
04acb5657b Add initial win_iis unit tests 2016-08-09 01:25:43 -07:00