C. R. Oldham
bfeb08168e
Merge remote-tracking branch 'upstream/2014.7' into 2015.2
2015-03-31 17:40:50 -06:00
twangboy
864438389d
Removed _tkinter.lib
2015-03-31 11:53:17 -06:00
Colton Myers
0269f3d544
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-03-30 09:30:58 -06:00
twangboy
110b0ef6f1
Remove .chm files from windows build
2015-03-30 14:26:30 +00:00
twangboy
de85a03add
Pull minion config settings from minion conf
2015-03-28 00:14:01 +00:00
Colton Myers
c924814e64
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-03-26 08:59:47 -06:00
Shane Lee
2605223e44
Update Salt-Minion-Setup.nsi
2015-03-26 07:03:51 -06:00
Shane Lee
9579bb2a8d
Update Salt-Minion-Setup.nsi
2015-03-26 07:02:16 -06:00
twangboy
d3cb6ddcd5
Accounted for silent install
2015-03-25 16:27:41 -06:00
twangboy
6bfe6fd4f6
Checks for existing installation and prompts to remove
2015-03-25 16:27:41 -06: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
81025d8388
Fixed version parameter
2015-03-20 13:50:56 -06:00
twangboy
db64bef89c
Updated BuildSalt and Salt-Minion-Setup.nsi
...
- Fixed problem with missing folders and files
- Fixed problem with detecting cpu architecture
2015-03-20 13:48:08 -06:00
Colton Myers
270027ff8d
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
pkg/windows/installer/Salt-Minion-Setup.nsi
salt/modules/mine.py
2015-03-20 13:34:30 -06:00
twangboy
fbec10071a
Edited Salt-Minion-Setup.nsi, Added BuildSalt.bat
2015-03-20 13:19:44 -06:00
twangboy
98944e9842
Added file to slim the windows install
2015-03-20 13:18:37 -06:00
twangboy
ced2e57165
Added files for the New Portable Salt Installer
2015-03-20 11:25:13 -06:00
twangboy
3af33668c9
Edited Salt-Minion-Setup.nsi, Added BuildSalt.bat
2015-03-18 19:19:16 -06:00
twangboy
cccb24da92
Added file to slim the windows install
2015-03-18 17:52:27 -06:00
twangboy
43b560e2ee
Added files for the New Portable Salt Installer
2015-03-18 17:35:09 -06:00
Colton Myers
f6eae029f0
Merge branch '2014.7' into merge-forward-2015.2
...
Conflicts:
pkg/windows/installer/Salt-Minion-Setup.nsi
salt/grains/core.py
salt/minion.py
salt/modules/mongodb.py
salt/states/archive.py
salt/states/mount.py
salt/utils/master.py
salt/utils/schedule.py
salt/utils/thin.py
tests/jenkins-ng.py
2015-01-06 13:14:27 -07:00
Loren Gordon
7f7c7bd337
Update vcredist version, fixes saltstack/salt#19387
...
Install the most current version of vcredist, Microsoft Visual C++ 2008
Service Pack 1 Redistributable Package MFC Security Update.
2015-01-06 12:18:13 -05:00
Tiru Srikantha
d1192819c5
Change URL for vcredist_x64 to SP1 DL URL
...
Fixes saltstack/salt#18935
2014-12-11 14:27:32 -08: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
Arjan de Vries
e01c27d225
Fix Silent install added option /SD to messagebox
2014-11-10 15:58:53 +01: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
David Boucha
810d2a6d9a
Merge pull request #15664 from UtahDave/2014.7fixreg
...
replace version with a jinja variable
2014-09-10 13:55:23 -06:00
David Boucha
df91a0929a
replace version with a jinja variable
2014-09-10 13:52:13 -06:00
steve
bc3ade860c
catch exceptions and fix some vars
2014-08-05 22:39:57 -04:00
Khris Richardson
1acd82f3f1
add sphinx spelling extension. enforce en_us
2014-07-13 13:43:33 -05:00
David Boucha
ea12719881
bump windows installer version
2014-07-12 23:18:58 -06:00
David Boucha
679b178111
bump windows installer version number
2014-05-19 17:57:50 -06: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
David Boucha
9c5880c188
bump windows installer version
2014-03-31 13:33:39 -06:00
pzbitskiy
b25d21f666
Check for VC 2008 redist package in Windows installer
...
* Download and install vcredist_x86 / vcredist_x64 if needed
* Fix for #10716
2014-03-22 17:31:05 +04:00
David Boucha
34a12d0929
bump windows installer version number
2014-02-25 09:58:34 -07:00
Mike Place
a485eceac9
Fix all broken links in docs. Ignore certain known-good links. Adjust many links that are returning 301.
...
Conflicts:
doc/topics/installation/index.rst
2014-02-20 16:16:59 -07:00
David Boucha
b44e681c5c
release 0.17.5 Windows installers
2014-02-14 01:45:48 -07:00
David Boucha
21c3ff1c70
bump Salt windows installer version
2013-12-26 10:40:19 -07:00
EquinoxeFR
34c6f6c831
Removing nsProcess plugin. Using ExecWait and a sleep 3s to stop salt-minion.
2013-10-24 15:19:21 +02:00
EquinoxeFR
f6ca119edc
Adding close process and service stop to windows installer
2013-10-22 12:12:02 +02:00
David Boucha
746369d7b6
Bump Salt Windows installer version. Add to docs
2013-10-18 01:24:37 -06:00
David Boucha
45724660fb
Bump windows installer version number
2013-10-08 11:31:19 -06:00
David Boucha
21b6f8790f
Bump minion version number.
2013-08-11 18:01:21 -06:00
David Boucha
57ef0dc0f7
bump Salt windows installer version to 0.16.2
2013-08-02 11:09:34 -06:00
Pedro Algarvio
9be409e95b
Merge pull request #6425 from UtahDave/lockdown_windows
...
Set permissions on Salt dir
2013-07-29 18:41:25 -07:00
