twangboy
6984b8fd60
Add /norestart to vcredist installer
2017-09-12 12:49:20 -06:00
twangboy
9979ccb613
Remove Py2 and Py3 in the same run
2017-08-31 14:15:06 -06:00
twangboy
a5d9f85db6
Modifications to build scripts
...
Py3 installs to c:\python35
Quote the path to the python install directory
Fix spellings in comments
Move pywin32 dlls to site-packages/win32 instead of python root
Remove pywin32 postinstall and testing scripts
Add passive switch to py3 uninstall
2017-08-31 11:41:13 -06:00
twangboy
ffb23fbe47
Remove the line that wipes out the cache
2017-08-14 12:26:27 -06:00
twangboy
a3becf8342
Change service shutdown timeouts
...
Windows default for stopping a service is 30 seconds. This changes the
default timeouts for the salt-minion service to more closely resemble
how it is handled in Windows. This gives Python a chance to cleanly exit
before being forcibly closed.
2017-08-14 11:19:09 -06:00
twangboy
8604312a7b
Remove master conf in minion install
2017-08-02 17:12:02 -06:00
rallytime
36a1bcf8c5
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/modules/win_wua.py
- salt/utils/schedule.py
- tests/unit/modules/rabbitmq_test.py
2017-07-27 14:00:15 -06:00
twangboy
d55a44dd1a
Avoid loading user site packages
2017-07-26 14:21:41 -06:00
twangboy
9af1eb2741
Ignore any PYTHON* environment vars already on the system
2017-07-26 13:42:12 -06:00
twangboy
4e2fb03a95
Add pythonpath to batch files and service
2017-07-26 12:21:14 -06:00
twangboy
a7c910c31e
Remove build and dist directories before install
2017-07-18 11:36:38 -06:00
twangboy
0946002713
Add blank line after delete
2017-07-18 11:28:49 -06:00
twangboy
f7c0bb4f46
Remove build and dist directories before install
2017-07-18 11:23:16 -06:00
Mike Place
41514b886e
Merge pull request #42096 from twangboy/win_use_default_configs
...
Use default salt configs for Windows installs
2017-07-03 17:03:26 -05:00
twangboy
c1e899c0ca
Create Master installer if script is found
2017-07-03 13:54:27 -06:00
twangboy
7da86b3540
Use default salt configs for Windows installs
2017-07-03 13:33:24 -06:00
twangboy
e4183a6d1c
Fix comments
2017-07-03 10:27:04 -06:00
twangboy
984b736e14
Add missing batch file
2017-07-03 10:24:10 -06:00
Mike Place
3cdd2fe96c
Merge pull request #41701 from twangboy/remove_win_unicode_console
...
Remove win_unicode_console dependency
2017-06-19 11:57:12 -05:00
twangboy
8b4e3ad77d
Upgrade psutil to version 5.2.2
2017-06-16 17:59:50 -06:00
rallytime
16a2747d7d
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- pkg/windows/buildenv/salt.bat
- salt/modules/pillar.py
- salt/utils/openstack/nova.py
- tests/unit/cloud/clouds/test_dimensiondata.py
- tests/unit/cloud/clouds/test_gce.py
2017-06-14 13:31:42 -06:00
twangboy
0d4be0220b
Add batch files for master
2017-06-12 15:48:46 -06:00
twangboy
e8a24db927
Remove win_unicode_console dependency
2017-06-12 11:56:18 -06:00
twangboy
c3a22dc0e7
Remove RAET deps, remove salt.bat
2017-05-24 16:22:43 -06:00
Mike Place
c195d075cd
Merge pull request #41151 from twangboy/fix_py_install
...
Fix python 2.7.13 install, fix clean script
2017-05-12 12:31:29 -05:00
rallytime
12a75c1108
Merge branch '2016.11' into 'nitrogen'
...
No conflicts.
2017-05-10 15:32:23 -06:00
twangboy
96918dcfa6
Add silent action to MsgBox for Path Actions
2017-05-10 11:22:18 -06:00
Mike Place
d1882e42dd
Merge pull request #40870 from twangboy/unicode_console
...
[DO NOT MERGE] Add win_unicode_console dependency
2017-05-09 13:09:20 -06:00
twangboy
53458b88e9
Fix python 2.7.13 install, fix clean script
2017-05-09 18:32:03 +00:00
twangboy
523316f0d7
Update Python and Deps
2017-04-28 17:19:15 -06:00
twangboy
fe20a576b5
Add win_unicode_console dep
2017-04-24 17:24:00 -06:00
rallytime
f552dd63f3
Merge branch '2016.11' into 'nitrogen'
...
Conflicts:
- pkg/windows/installer/Salt-Minion-Setup.nsi
- tests/unit/states/test_tomcat.py
2017-04-14 10:46:56 -06:00
twangboy
b6ac4aa86d
Fix service for win10 update
2017-04-13 13:51:15 -06:00
rallytime
17efc7341c
Merge branch '2016.11' into 'nitrogen'
...
Conflicts:
- salt/modules/win_wua.py
- salt/netapi/rest_cherrypy/app.py
- salt/version.py
- tests/unit/states/grains_test.py
- tests/unit/states/test_archive.py
2017-04-13 10:14:51 -06:00
twangboy
0f7a81cd34
Keep network.py execution module
2017-04-11 14:13:31 -06:00
twangboy
f71d5cccde
Copy pywin32 dlls to python directory
2017-04-10 23:51:11 +00:00
twangboy
90e5022e82
Fix nsis script error
2017-03-31 15:12:41 -06:00
rallytime
dbf74330ec
Merge branch '2016.11' into 'develop'
...
Conflicts:
- pkg/windows/req_base.txt
- salt/modules/ssh.py
2017-03-23 16:40:44 -06:00
rallytime
5c5b74b09a
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- pkg/windows/req.txt
2017-03-22 17:20:58 -06:00
twangboy
6761527793
Update dependencies for PyOpenSSL
2017-03-21 11:03:20 -06:00
twangboy
5f75ca71dd
Update dates in the env scripts
2017-03-11 22:21:40 -07:00
twangboy
02757db1e4
Add python 3 installer for Windows
2017-03-10 21:52:38 +00:00
Pedro Algarvio
878e770088
Bump required SaltPyLint version
2017-03-06 15:28:58 +00:00
Pedro Algarvio
1dd7d8d88f
Require SaltPyLint >= v2017.2.22
...
Minimal Python version for develop is now 2.7
2017-02-22 12:15:31 +00:00
rallytime
c46f82c029
Merge branch '2016.11' into 'develop'
...
Conflicts:
- requirements/dev_python27.txt
- requirements/dev_python34.txt
2017-02-21 14:20:20 -07:00
rallytime
dda39d4e63
Merge branch '2016.11' into 'develop'
...
Conflicts:
- salt/minion.py
- salt/modules/file.py
- salt/modules/grains.py
- salt/utils/gitfs.py
2017-02-16 12:18:46 -07:00
twangboy
8dd915dae4
Add salt icon to buildenv directory
2017-02-16 12:04:21 -07:00
twangboy
98d5cc3e1b
Add additional tests to the Windows whitelist
2017-02-15 21:21:55 +00:00
twangboy
ef5078729a
Capitalize the 'r' for 2008R2
2017-02-09 09:55:59 -07:00
twangboy
1b6bd634ac
Require VCRedist on 2008R2 and below instead of 2008
2017-02-09 09:47:47 -07:00
