twangboy
9155e69c15
Turned on Multiprocessing for windows
2015-07-06 09:49:07 -06:00
Sergey Kizunov
714dc95159
Adding missing .bat scripts for salt-master and friends
...
Adding:
- salt-key.bat
- salt-master.bat
- salt-run.bat
- salt.bat
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2015-05-15 20:14:32 -05:00
Colton Myers
929b7baaf3
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-04-17 11:38:54 -06:00
salt_build
075f82e046
Final edits to the batch files for running salt
2015-04-16 22:08:27 +00:00
twangboy
223c46a38e
Removed redundent \ and "
2015-04-16 18:40:23 +00:00
Colton Myers
8d9874a78a
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-04-16 10:37:38 -06:00
salt_build
2d3d0b1c15
Changed %cd% to %~dp0
2015-04-16 15:07:28 +00:00
Colton Myers
9b8f6085d2
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
pkg/windows/BuildSalt.bat
pkg/windows/installer/Salt-Minion-Setup.nsi
2015-03-20 14:39:22 -06:00
Shane Lee
febef7eb78
Update salt-cp.bat
2015-03-20 14:18:57 -06:00
twangboy
d5da92e58c
Added batchfiles to mimick the behavior of the exe's
2015-03-20 14:12:48 -06:00
twangboy
ced2e57165
Added files for the New Portable Salt Installer
2015-03-20 11:25:13 -06:00
twangboy
43b560e2ee
Added files for the New Portable Salt Installer
2015-03-18 17:35:09 -06:00
Pedro Algarvio
733b31da23
Merge branch '2014.7' into develop
...
Conflicts:
tests/unit/modules/hashutil_test.py
tests/unit/templates/jinja_test.py
2014-11-27 03:59:40 +00:00
C. R. Oldham
f41cc45a8f
Switch nssm back to 32-bit
2014-11-26 13:35:53 -07:00
Colton Myers
0cc0d64136
Merge branch '2014.7' into develop
...
Conflicts:
salt/modules/hg.py
2014-10-31 16:14:34 -06:00
C. R. Oldham
6c9be002c5
Update nssm to 2.24
2014-10-30 22:15:26 -04:00
steve
bc3ade860c
catch exceptions and fix some vars
2014-08-05 22:39:57 -04:00
Ryan Davis
8fdced7877
windows: update to nssm 2.21.1
...
new 32-bit binary for nssm.exe, upgrading from the previous 2.16.
Has some bug fixes, see http://nssm.cc/changelog .
Driving impetus to upgrade was "Silently ignore INTERROGATE control.",
on win2012 nssm spews ~30 event log messages per minute.
Tested by stopping windows minion, replacing nssm.exe, and restarting.
2014-05-02 09:13:00 -04:00
Thomas L. Kula
54a0746b4e
Backoff when minion fails to connect
...
NOTE: This is a potential change --- I haven't actually gotten a
test environment to try this out.
This adds a configuration option to the minion,
`acceptance_wait_time_max', that if set changes the acceptance
wait loop to add `acceptance_wait_time' seconds to the wait between
each iteration, up to this maximum value.
POTENTIAL FIX: Issue #5813
2013-07-27 16:51:38 -04:00
Chris Rebert
e89cbf4447
capitalize Linux in comments/docs
2013-05-15 19:21:50 -07:00
David Boucha
ca707eccff
Turn off multiprocessing on Windows for now
2013-05-05 01:11:05 -06:00
David Boucha
42972a8cb0
Add Windows Installer Package resources.
2013-01-04 08:57:30 -07:00
