Colton Myers
a18e017619
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/man/salt.1
doc/ref/cli/salt.rst
2015-04-24 10:07:48 -06:00
Justin Findlay
3d575e29c4
set systemd service killMode to process for minion
...
Fixes #22993 .
The change is only made for the minion process because, theoretically,
only the minion could create the problem described. salt-master and
salt-syndic do not theoretically spawn non-salt processes during the
lifetime of their processes, whereas salt-minion does this by design.
The default behavior for systemd killMode seems to be control-group,
which means all processes that share the same control group as the
minion process will also be killed by systemd when the minion service is
stopped (killed).
It is reasonable to expect that activity done on a system by a salt
minion should persist beyond the lifetime of the minion process, so
let's not kill procs that the minion starts even when the minion exits.
2015-04-23 16:18:19 -06:00
salt_build
7cbabd0cf9
Updated icon file for windows
2015-04-21 22:33:59 +00:00
Colton Myers
92c51affc5
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-04-21 10:33:39 -06:00
salt_build
7235bb0b68
Removed some parenthesis
2015-04-20 23:59:33 +00:00
salt_build
a4e24f5c6a
Added new panel graphic to installer
2015-04-20 23:56:11 +00:00
salt_build
3f180cfaae
Added ability to send a version with a space in it
2015-04-20 21:55:57 +00:00
Colton Myers
929b7baaf3
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-04-17 11:38:54 -06:00
Justin Findlay
3c91459de2
Merge pull request #22759 from twangboy/fix_bat_one_last_time
...
Final edits to the batch files for running salt
2015-04-16 22:31:15 -06:00
salt_build
4d25af8acf
Fixed version not showing in Add/Remove Programs
2015-04-16 22:43:51 +00: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
9099884809
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/cloud/config.rst
salt/modules/win_disk.py
salt/modules/yumpkg.py
salt/pillar/s3.py
salt/states/service.py
salt/utils/event.py
tests/integration/netapi/rest_tornado/test_app.py
tests/integration/netapi/test_client.py
tests/unit/states/archive_test.py
2015-04-14 11:03:03 -06:00
salt_build
6d99681b8d
Moved file deletion to happen after user clicks install
2015-04-08 18:25:56 +00:00
Colton Myers
25f9b2d2d1
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/cloud/action.rst
doc/topics/cloud/function.rst
doc/topics/reactor/index.rst
2015-04-07 10:05:35 -06:00
Shane Lee
b71602a39c
Update BuildSalt.bat
2015-04-06 17:52:58 -06:00
Shane Lee
4a3a8b4606
Update BuildSalt.bat
2015-04-06 17:52:38 -06:00
Shane Lee
ba1d3965d2
Update BuildSalt.bat
2015-04-06 17:51:49 -06:00
Shane Lee
8e8b4fb26f
Update BuildSalt.bat
2015-04-06 17:50:49 -06:00
salt_build
c898b951bc
Fixed problem with pip not working on portable install
2015-04-06 23:04:24 +00:00
twangboy
51370ab2f9
Removed dialog box that was used for testing
2015-04-03 00:17:12 +00:00
twangboy
7377c503de
Add switches for passing version to nsi script
2015-04-03 00:13:58 +00:00
jfindlay
4d0ea7a863
Merge pull request #22266 from twangboy/win_install_fix
...
Win install fix
2015-04-02 12:59:31 -06:00
Nahum Shalman
a51a90c128
SmartOS Esky: pkgsrc 2014Q4 Build Environment
...
Need to clean up /var/db/pkgin
Need to install mysql-client explicitly
libzmq seems to link against libsodium... drag it along.
2015-04-02 11:27:22 -04:00
twangboy
41a96d4daa
Fixed hard coded version
2015-04-01 22:14:35 +00:00
twangboy
82b2f3e637
Removed message_box i left in for testing
...
I'm an idiot
2015-04-01 22:11:08 +00:00
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
