Justin Findlay
bd4540e3a6
Merge pull request #25730 from sjorge/patch-1
...
patchelf lives in pkgsrc
2015-07-27 09:18:50 -06:00
Jorge Schrauwen
163346d02e
cleanup of python requirements
...
halite is deprecated, could requirements file got removed so importing it fails in the until loops.
2015-07-26 12:31:46 +02:00
Jorge Schrauwen
349b029cd8
patchelf lives in pkgsrc
...
alteast on base-64-lts 14.4.0 release
2015-07-26 12:23:59 +02:00
Pedro Algarvio
f8ee8c1ba9
Merge remote-tracking branch 'upstream/2015.8' into develop
2015-07-16 20:08:28 +01:00
Colton Myers
2a144b954a
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/ref/states/requisites.rst
doc/topics/tutorials/states_pt5.rst
salt/cloud/clouds/ec2.py
salt/config.py
salt/minion.py
salt/modules/cp.py
salt/pillar/__init__.py
salt/states/file.py
2015-07-14 10:57:36 -06:00
Benjamin Bergia
675a309e15
Add a method context containing the path
2015-07-11 10:12:24 +08:00
twangboy
e61eeba48b
Fixed problem with service not starting
2015-07-08 22:23:45 +00:00
twangboy
9155e69c15
Turned on Multiprocessing for windows
2015-07-06 09:49:07 -06:00
Colton Myers
99fc7ecb4b
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/man/salt-call.1
doc/man/salt-cloud.1
doc/man/salt-cp.1
doc/man/salt.7
salt/cloud/__init__.py
salt/fileclient.py
salt/modules/file.py
salt/modules/gpg.py
2015-06-29 16:49:40 -06:00
Colton Myers
8d8bf3476f
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
2015-06-24 11:12:15 -06:00
Bret Fisher
d7bfb0c7fd
Smartos smf minion fix
...
Per my own testing on dozens of SmartOS VM's and issue #473 "Problem
3", the salt-minion service manifest definition doesn't work. This
change fixes that. I think it may have broke in 2014.7 so back porting
to that ver.
2015-06-23 22:34:07 -04:00
Colton Myers
725e5c689f
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
2015-06-11 13:15:38 -06:00
Colton Myers
e1d45ccf3b
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
2015-06-10 12:02:42 -06:00
twangboy
673e1d809e
Added missing panel.bmp for installer
2015-06-09 10:28:09 -06:00
twangboy
cc50218b01
Start Minion Service on Silent Install
2015-06-09 09:34:41 -06:00
Colton Myers
5fcbcfe6d5
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/cloud/digitalocean.rst
doc/topics/tutorials/index.rst
salt/cloud/clouds/digital_ocean.py
salt/modules/lxc.py
salt/returners/__init__.py
2015-05-29 17:33:28 -06:00
Justin Findlay
dac055dd8b
Merge pull request #24252 from aboe76/opensuse_package
...
Updated suse spec to 2015.5.1
2015-05-29 15:38:45 -06:00
Colton Myers
c4f5e231fa
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2
...
Conflicts:
doc/_themes/saltstack2/layout.html
doc/conf.py
doc/index.rst
doc/ref/modules/all/salt.modules.hipchat.rst
doc/topics/releases/index.rst
salt/client/ssh/client.py
salt/cloud/clouds/vsphere.py
salt/modules/boto_dynamodb.py
salt/modules/boto_route53.py
salt/modules/data.py
salt/modules/http.py
salt/modules/tls.py
salt/output/compact.py
salt/states/boto_elb.py
salt/states/linux_acl.py
salt/states/rabbitmq_user.py
salt/states/win_servermanager.py
salt/utils/dictupdate.py
salt/wheel/config.py
2015-05-29 15:10:13 -06:00
Niels Abspoel
0ad617df21
Updated suse spec to 2015.5.1
2015-05-29 20:26:31 +02:00
Ben Woodward
6632d06e94
Unset PYTHONHOME when starting the service
...
Means that installing Python on the system shouldn't break Salt
2015-05-29 15:28:35 +01:00
Colton Myers
e52b5ab2e2
Remove stray >>>>>
2015-05-26 15:51:56 -06:00
Niels Abspoel
3f65631cb6
updated suse spec file to version 2015.5.0
2015-05-16 10:57:46 -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
Niels Abspoel
15139c3e1a
updated suse spec file to version 2015.5.0
2015-05-15 22:51:28 +02:00
Colton Myers
7d8038f134
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
debian/changelog
salt/modules/win_pkg.py
salt/pillar/__init__.py
salt/states/file.py
2015-05-14 10:27:00 -06:00
Colton Myers
bd635488ef
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
2015-05-13 11:49:55 -06:00
twangboy
038331edab
Fixed checkbox for starting service and actually starting it
2015-05-12 18:04:42 +00:00
Eric Cook
7b396785e4
mutually exclusive completion for the target options
2015-05-05 17:06:07 -04:00
Colton Myers
befb666623
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/modules/mongodb.py
salt/utils/http.py
salt/utils/process.py
tests/integration/__init__.py
2015-04-27 10:28:53 -06:00
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
Colton Myers
1a38b4b834
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/cli/salt.py
salt/client/mixins.py
salt/renderers/pyobjects.py
2015-04-22 11:07:01 -06:00
salt_build
7cbabd0cf9
Updated icon file for windows
2015-04-21 22:33:59 +00:00
Colton Myers
bd6ecdfd43
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/installation/windows.rst
doc/topics/tutorials/gitfs.rst
salt/pillar/pepa.py
salt/states/artifactory.py
salt/states/pip_state.py
salt/transport/__init__.py
2015-04-21 10:42:22 -06: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
ef583295d5
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/beacons/service.py
2015-04-20 11:41:25 -06: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
66378be75e
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/ref/states/requisites.rst
salt/master.py
salt/modules/win_pkg.py
2015-04-16 12:27:53 -06:00
Colton Myers
000de95974
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
.pylintrc
doc/ref/runners/all/salt.runners.nacl.rst
doc/topics/cloud/config.rst
salt/cli/salt.py
salt/client/mixins.py
salt/client/ssh/__init__.py
salt/loader.py
salt/minion.py
salt/modules/cassandra_cql.py
salt/modules/gpg.py
salt/modules/grains.py
salt/modules/iptables.py
salt/modules/yumpkg.py
salt/netapi/rest_cherrypy/app.py
salt/renderers/pyobjects.py
salt/returners/mysql.py
salt/runners/jobs.py
salt/state.py
salt/states/file.py
salt/states/service.py
salt/utils/minions.py
tests/integration/__init__.py
tests/integration/netapi/rest_tornado/test_app.py
tests/integration/states/cmd.py
2015-04-16 12:15:44 -06: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
Thomas S Hatch
2364dfd0f1
Merge pull request #22094 from gladiatr72/RPM_systemd_NOFILE
...
fine tuning systemd support (or, how not to destroy open-file limits when upgrading your salt-master)
2015-04-13 15:47:34 -06:00
