Commit Graph

12 Commits

Author SHA1 Message Date
rallytime
315b2c8712 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/modules/win_system.py
  - tests/unit/modules/win_system_test.py
2017-01-18 14:16:45 -07:00
twangboy
d57a51f9f9 Fix tests for get_hostname 2017-01-18 11:27:50 -07:00
Mike Place
9aea24aa47 Fixed a bug in windows hostname settings when the hostname is longer than 15 chars (#35848)
- The previous implementation was limited to the 15 char limit for "Computernames" which would cause the state to always fail if the hostname was longer
2016-08-29 10:09:53 -06:00
Mike Place
f7bfc5dd4a Don't run Windows tests on Linux 2016-08-03 01:53:27 +09:00
Daniel Hobley
a78aab3255 Added the ability to change the "hostname" on windows minions 2015-10-29 11:39:22 +01:00
Colton Myers
ee4b788745 Skip tests that require windows libraries if not present 2015-08-10 16:57:06 -06:00
Colton Myers
1b0b21394e Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/modules/win_system.py
2015-08-10 13:27:31 -06:00
twangboy
0502897635 Fixed the lint... again 2015-08-04 17:43:58 -06:00
twangboy
6f85d6b9af Fixed some lint 2015-08-04 17:13:47 -06:00
Justin Findlay
9156bbd33e update win_system exec mod unit tests 2015-08-04 15:55:32 -06:00
Daniel Hobley
1ad9da30e5 Added a way to wait for a reboot to complete on Windows
- This is useful if you have many states that are being run in a highstate and you don't want the rest of the states, running just before a reboot as this could lead to half complete states i.e installing software
2015-07-27 14:16:02 +02:00
Rahul Handay
37731bbfdf Adding win_system unit test cases 2015-04-06 14:16:38 +05:30