Colton Myers
1e3160f21c
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-04-01 14:17:35 -06:00
Shane Lee
9ab3d5e5b4
Merge pull request #22222 from twangboy/fix_installer
...
Fixed problem with nested directories
2015-04-01 08:08:05 -06:00
C. R. Oldham
bfeb08168e
Merge remote-tracking branch 'upstream/2014.7' into 2015.2
2015-03-31 17:40:50 -06:00
twangboy
8615e8d403
Fixed problem with nested directories
2015-03-31 17:26:46 -06:00
twangboy
864438389d
Removed _tkinter.lib
2015-03-31 11:53:17 -06:00
Thomas S Hatch
3530c783b1
Move zsh completion into a sane location
2015-03-30 16:27:05 -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
c1e630340e
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/fileserver/gitfs.py
salt/grains/core.py
2015-01-22 16:46:32 -07:00
Nahum Shalman
32c222f8f2
SmartOS Esky: fix build version identification
...
"bdist" doesn't do the right thing in the absence of
version files produced by "sdist".
Run "sdist" then extract out the contents of the tarball
into place
2015-01-21 20:06:48 -05: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
Niels Abspoel
3d9fa5ce1c
Updated suse spec file to salt 2014.7
2014-11-19 22:48:12 +01:00
Thomas S Hatch
2be11167d6
Merge pull request #18140 from rominf/fish-completion
...
fish shell completion: fix broken arguments completion
2014-11-17 17:14:28 -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
Niels Abspoel
faaeb57759
Updated spec file to 2014.1.13
2014-10-27 22:47:30 +01:00
Erik Johnson
33a74e422e
Update Fedora/RHEL spec for 2014.1.13
2014-10-17 10:46:14 -05:00
Roman Inflianskas
49fca16fb4
fish shell completion: fix broken arguments completion
2014-10-12 13:51:47 +04:00
Erik Johnson
713f3ecc73
Spelling fixes
2014-10-11 20:13:45 -05:00
Niels Abspoel
5fd3ef480f
updated salt.spec file for suse:
...
this fixes #16560
2014-10-11 20:29:52 +02:00
Erik Johnson
b18ae95f84
Update RPM spec for 2014.1.11
2014-10-01 18:35:23 -05:00
Colton Myers
99e97320e1
Merge branch '2014.7' into develop
...
Conflicts:
doc/ref/configuration/minion.rst
doc/ref/states/requisites.rst
doc/topics/troubleshooting/master.rst
doc/topics/tutorials/index.rst
doc/topics/tutorials/intro_scale.rst
salt/config.py
salt/key.py
salt/master.py
salt/minion.py
salt/modules/file.py
salt/modules/hashutil.py
salt/modules/lxc.py
salt/modules/oracle.py
salt/modules/tls.py
salt/modules/win_update.py
salt/pillar/pepa.py
salt/pillar/s3.py
salt/states/augeas.py
salt/states/win_update.py
salt/tops/ext_nodes.py
salt/utils/master.py
2014-09-22 14:22:54 -06:00
David Boucha
25303c586f
remove problematic expect fork
2014-09-18 10:40:05 -06:00
Roman Inflianskas
ef2b3d81b9
fish shell completion: merge
2014-09-13 14:45:20 +04:00
Roman Inflianskas
f986dee05a
fish shell completion: fix remote cmd completion for cmd.run and similar
2014-09-13 14:33:53 +04:00
Pedro Algarvio
781092daaa
Merge branch '2014.7' into develop
2014-09-11 22:42:04 +01:00
Jille Timmermans
a8e3586aa1
Some textual fixes
2014-09-11 14:45:44 +02:00
