valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
70,956 Commits 24 Branches 182 Tags 341 MiB
397258a2d4
Commit Graph

646 Commits

Author SHA1 Message Date
twangboy
1dcc23c85b Fix error on kickstart command 2016-02-05 09:34:02 -07:00
twangboy
7a163c46d8 Change to new way of starting and stopping services 2016-02-05 09:33:44 -07:00
twangboy
23d47722b7 Fix preinstall and postinstall scripts 
stops the service if running
starts the service after install
service names follow apple naming convention (com.saltstack.salt...)
 2016-02-05 09:33:30 -07:00
twangboy
7ef723d815 Upgrade to latest pip 2016-02-05 09:33:16 -07:00
twangboy
0f09ad517f Updated pip dependencies 2016-02-05 09:32:59 -07:00
twangboy
d3d4c1d13f Removed GPL Licensed software from build 
Removed:
- gdbm
- gnu-readline
- libgit2
- pygit2
- cmake (used to compile libgit2)

Removed traces of pkg-congig after build

Updated license to say it was built using pkg-config

Updated openssl to 1.0.2f
 2016-02-05 09:32:42 -07:00
Benjamin Drung
708f2ff8ea Fix typo reponse -> response 2016-02-04 13:06:04 +01:00
Benjamin Drung
72c4eab6d7 Fix typo propogate -> propagate 2016-02-04 13:04:27 +01:00
Benjamin Drung
bf92c3663b Fix typo formating -> formatting 2016-02-04 12:45:19 +01:00
Justin Findlay
543f0ca712 doc, conf, pkg: VMWare -> VMware 2016-02-03 14:27:28 -07:00
rallytime
4fa80f2d5e Merge branch '2015.8' into 'develop' 
Conflicts:
  - doc/ref/states/all/index.rst
  - salt/cloud/__init__.py
  - salt/minion.py
  - salt/modules/file.py
  - salt/modules/guestfs.py
  - salt/modules/ipmi.py
  - salt/modules/osquery.py
  - salt/modules/parted.py
  - salt/modules/seed.py
  - salt/modules/virt.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/boto_elb.py
  - salt/states/pkg.py
 2016-01-26 16:19:39 -07:00
Colton Myers
80d0e428aa Merge pull request #30624 from cro/remove_bad_symlinks 
Remove bad symlinks from osx pkg dir
 2016-01-25 17:02:25 -07:00
C. R. Oldham
f5fd38624e Remove bad symlinks in osx pkg dirs 2016-01-25 14:29:51 -07:00
Erik Johnson
d649551fbf Merge branch '2015.5' into 2015.5-2015.8 2016-01-24 11:55:09 -06:00
Jorge Schrauwen
8417f8da08 drop augeas as libaugeas is a pain to patch 2016-01-23 14:02:59 +00:00
Jorge Schrauwen
a48c7b6b2b smartos packages are frozen so adding modules via pip does not work, include a few more by default 2016-01-23 13:10:05 +00:00
Jacob Hammons
03c51bb54d Added placeholder release notes for 2015.5.10 
Changed old doc links from docs.saltstack.org to docs.saltstack.com
 2016-01-22 10:48:08 -07:00
Colton Myers
cb8bf91944 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/ref/configuration/master.rst
    doc/topics/cloud/linode.rst
    salt/cloud/clouds/linode.py
    salt/modules/rh_ip.py
    salt/renderers/pyobjects.py
    salt/states/file.py
 2016-01-21 17:42:50 -07:00
David Cournapeau
3c27ab5310 BUG: fix osx .pkg script locations to match the .plist files. 2016-01-19 09:37:20 -08:00
David Cournapeau
ed9ab68d3b BUG: fix missing sudo when linking certify cert. 2016-01-19 07:58:11 -08:00
rallytime
c386d70742 Merge branch '2015.8' into 'develop' 
Conflicts:
  - salt/modules/alternatives.py
  - salt/modules/boto_rds.py
  - salt/modules/mount.py
  - salt/states/boto_iam.py
 2015-12-29 15:51:12 -07:00
twangboy
0be53953af Added function to download and check hashes, added hash files 2015-12-22 13:08:23 -07:00
twangboy
7f0b87bfb3 Added pre/post flight scripts (not running) 2015-12-22 09:28:47 -07:00
twangboy
9eeb6da7bd Improvements to osx packaging scripts 2015-12-21 13:07:53 -07:00
Mike Place
14a19f9313 Merge pull request #29634 from cachedout/lint_29459 
Lint 29459
 2015-12-11 12:53:07 -07:00
Colton Myers
7918736656 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/ssh_py_shim.py
    salt/modules/dracr.py
    salt/states/boto_vpc.py
    tests/unit/states/file_test.py
 2015-12-08 14:46:23 -07:00
Colton Myers
9673fd0937 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cloud/clouds/ec2.py
    tests/unit/states/file_test.py
 2015-12-08 12:23:26 -07:00
Benjamin Drung
b1a4ade618 Drop obsolete syslog.target from systemd services 
Declaring After=syslog.target is unnecessary by now because syslog is
socket-activated and will therefore be started when needed. Thus remove
the obsolete syslog.target from the systemd service files.
 2015-12-08 13:48:34 +01:00
Damian Myerscough
85a8a3b033 Fix resource limits, systemd sets the default number of open files to 4096 causing te master to complain about limits when you have a large number of keys 2015-12-05 00:21:57 -08:00
Craig Rodrigues
381e8cc144 Use print as a function [PEP 3105]. 
This reduces warnings from the 2to3 utility
and future proofs the code when it is time to move to Python 3.
 2015-12-04 16:17:35 -08:00
C. R. Oldham
8e191ae264 Add web references 2015-12-04 09:30:10 -07:00
C. R. Oldham
5f1459d708 Update mac packaging 2015-12-04 09:30:10 -07:00
C. R. Oldham
092b7ddd0a First crack at build files for Mac OS X Native package 2015-12-04 09:30:10 -07:00
Colton Myers
3f09d58fff Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/modules/rh_ip.py
    salt/modules/s3.py
    salt/modules/saltutil.py
    salt/modules/zypper.py
    salt/spm/__init__.py
    salt/utils/aws.py
    salt/utils/s3.py
    tests/unit/modules/s3_test.py
    tests/unit/pydsl_test.py
 2015-12-01 15:31:03 -07:00
Colton Myers
0d90dd3a19 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    debian/salt-master.service
    salt/modules/win_pkg.py
 2015-12-01 13:26:44 -07:00
Eric Cook
a45d869b57 zsh-completion: improved cache validation 
allows a user to control how long to keep various caches without
defining their own function to override ours.

The default duration was changed from 7 days to 1 day. which seems a bit
more useful for people who don't have a static number of hosts like
myself.
 2015-11-22 00:30:58 -05:00
rallytime
d31b0d1573 Merge branch '2015.8' into develop 2015-11-04 15:40:03 -07:00
twangboy
90b19a3279 Fixed the script... something got broke... 2015-11-04 10:53:10 -07:00
Benjamin Drung
89dcb66310 Fix the wrong "allow to do" phrase 
"allow to do" is not a valid English phrase. Either use a gerund (allow
doing) or add a patient/object (allow someone to do).
 2015-11-04 12:15:41 +01:00
Colton Myers
32969b2408 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/cloud/digitalocean.rst
    salt/cloud/clouds/digital_ocean.py
    salt/cloud/clouds/linode.py
    salt/loader.py
    salt/modules/blockdev.py
    salt/modules/boto_route53.py
    salt/modules/boto_vpc.py
    salt/modules/bsd_shadow.py
    salt/modules/file.py
    salt/modules/rabbitmq.py
    salt/modules/schedule.py
    salt/modules/win_network.py
    salt/runners/state.py
    salt/spm/__init__.py
    tests/unit/modules/blockdev_test.py
 2015-11-02 18:19:01 -07:00
Colton Myers
3286a5250f Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/installation/windows.rst
    doc/topics/tutorials/pillar.rst
    pkg/windows/installer/Salt-Minion-Setup.nsi
    salt/modules/file.py
    salt/modules/schedule.py
    salt/pillar/git_pillar.py
    salt/states/boto_route53.py
    salt/states/pkg.py
    tests/integration/modules/pillar.py
 2015-10-30 16:05:26 -06:00
twangboy
a0c5223554 Fixes #27923 and #28000 
Fixed a bug where the installer wouldn't grab current config if the salt
service was stopped
Added a switch to start the salt service at the end
Switch works with both silent and GUI installs
/start-service=1 will start the service
/start-service=0 will not start the service
Default is to start the service
 2015-10-27 15:43:22 -06:00
Zach Malone
318473d8fe Extra suse init script fix for $? after an echo 2015-10-23 09:58:34 -06:00
Zach Malone
d8767959d6 Removing $? after "echo" for other startup scripts 2015-10-23 09:57:53 -06:00
Niels Abspoel
8d796e6732 update suse spec file to 2015.8.1 2015-10-18 12:24:09 +02:00
Colton Myers
41cad702e3 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/minion.py
    salt/modules/rest_service.py
    salt/states/dockerng.py
    salt/utils/cloud.py
 2015-09-29 18:13:33 -06:00
twangboy
63a7305ae9 Uninstaller only removes specific files and dirs 
Fixes: #27032

Uninstaller only removes the following:
- ./bin
- salt*
- nssm.exe
- uninst.exe

All other files will remain untouched
 2015-09-24 14:59:32 -06:00
Eric Cook
2bee0fd3d0 zsh-completion: add completion for salt-key 2015-09-19 18:35:39 -04:00
Eric Cook
6f4f971ea7 zsh-completion: add completion for salt-run 2015-09-19 18:32:23 -04:00
Eric Cook
973a2b46fd zsh-completion: remove -d, --doc, argument expectation 
and small formatting changes.
 2015-09-19 18:25:39 -04:00
twangboy
7e35b13022 Turned multiprocessing on 2015-09-11 08:10:52 -06:00
Evgeny Vereshchagin
134b3a6e89 Use systemd-notify on systems without python2 systemd bindings 2015-09-11 05:01:49 +03:00
Colton Myers
278e8dda5b Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/gce.py
 2015-09-01 15:15:13 -06:00
Jorge Schrauwen
9efef940c1 fix SPM paths on smartos/illumos esky 2015-08-28 21:42:44 +00:00
Colton Myers
73282d51cc Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cli/daemons.py
    salt/master.py
    salt/minion.py
    salt/modules/gpg.py
    salt/modules/pw_group.py
    salt/utils/http.py
    setup.py
    tests/unit/modules/schedule_test.py
 2015-08-19 11:29:45 -06:00
Simon Ye
2ab5ee90b3 Add /usr/local/bin to $PATH in salt-minion plist 2015-08-17 22:41:25 -04:00
Colton Myers
d3d0e004d9 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/minion.py
    salt/modules/gpg.py
    salt/modules/keystone.py
    salt/modules/pw_user.py
    salt/states/reg.py
    setup.py
 2015-08-17 16:54:16 -06:00
Bastiaan Bakker
ec8d4b0470 test wether RETVAL is 0 with -eq rather than =. 2015-08-17 17:20:33 +02:00
Bastiaan Bakker
a83a5de41e fix issue #26161: on RedHat family systems touch /var/lock/subsys/$SERVICE to ensure the daemon will be stopped on shutdown. 2015-08-17 11:11:12 +02:00
Colton Myers
d5fbd960fe Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/fileserver/s3fs.py
    salt/modules/chocolatey.py
    salt/modules/s3.py
    salt/modules/zpool.py
    salt/pillar/s3.py
    salt/utils/s3.py
    tests/unit/modules/s3_test.py
 2015-08-03 15:01:35 -06:00
Colton Myers
7b50807a12 Merge pull request #25902 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-03 14:30:07 -06:00
Jorge Schrauwen
ebb63f15a6 create log directory for smartos esky package 2015-07-31 16:34:02 +00:00
Colton Myers
e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    debian/changelog
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/cloud/clouds/vmware.py
    salt/config.py
    salt/fileclient.py
    salt/minion.py
    salt/modules/chocolatey.py
    salt/modules/localemod.py
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/schedule.py
    salt/modules/state.py
    salt/modules/win_file.py
    salt/modules/win_pkg.py
    salt/state.py
    salt/states/file.py
    salt/utils/args.py
    tests/unit/states/file_test.py
 2015-07-30 16:54:44 -06:00
Jorge Schrauwen
937779eb51 patchelf lives in pkgsrc 
alteast on base-64-lts 14.4.0 release
 2015-07-28 10:03:20 -06:00
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
c825683363 cleanup of python requirements 
halite is deprecated, could requirements file got removed so importing it fails in the until loops.
 2015-07-27 09:04:23 -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
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
Eric Cook
c3feffd229 allow caching minions, modules, or salt_dir individually. 2015-04-05 10:15:46 -04:00
Eric Cook
e384066899 skip completing minions when -N or --grain-regex is used. 2015-04-05 10:10:42 -04:00
Eric Cook
e419ce7dda fix --doc, --return and --out from 68552fd408 by delaying the expansion of salt_dir. 2015-04-05 10:07:54 -04: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
0b7ac988cc Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    .pylintrc
    salt/beacons/service.py
    salt/beacons/sh.py
    salt/modules/cassandra_cql.py
    salt/returners/cassandra_cql_return.py
 2015-04-01 14:22:33 -06: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
124ad51c40 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    doc/ref/index.rst
    doc/topics/eauth/index.rst
    salt/beacons/__init__.py
    salt/beacons/service.py
    salt/loader.py
    salt/minion.py
    salt/output/nested.py
 2015-03-30 15:10:17 -06:00
Stephen Spencer
307ded4e98 salt-api.service:LimitNOFILE=8192 
salt-master.service:LimitNOFILE=16384
salt-minion.service:LimitNOFILE=8192
salt-syndic.service:LimitNOFILE=8192
 2015-03-30 13:32:07 -05: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
Stephen Spencer
9980a251e4 At the very least there should be a comment of some sort indicating what 
directive needs to be set.
 2015-03-27 15:50:43 -05:00
Stephen Spencer
8483fd37b7 Old crufty patches 2015-03-27 15:48:26 -05:00
Stephen Spencer
88be7b38d6 This is the (RPM) spec file used by Erik Johnson for building EPEL 
packages.

The only change:
avoid replacing the salt*.service files. Systemd ignores
/etc/security/limits*; it, instead, uses its own directives that are
required to exist in the service file itself.

See systemd.directives(7), systemd.exec(5), systemd-system.conf(5)
 2015-03-27 15:26:32 -05:00
Stephen Spencer
ab4bd93576 The spec file for salt-api is anachronistic at this point 2015-03-27 15:20:46 -05: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