valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
78,451 Commits 24 Branches 182 Tags 341 MiB
deba6d2655
Commit Graph

773 Commits

Author SHA1 Message Date
rallytime
dda39d4e63 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/minion.py
  - salt/modules/file.py
  - salt/modules/grains.py
  - salt/utils/gitfs.py
 2017-02-16 12:18:46 -07:00
twangboy
98d5cc3e1b Add additional tests to the Windows whitelist 2017-02-15 21:21:55 +00:00
twangboy
ef5078729a Capitalize the 'r' for 2008R2 2017-02-09 09:55:59 -07:00
twangboy
1b6bd634ac Require VCRedist on 2008R2 and below instead of 2008 2017-02-09 09:47:47 -07:00
rallytime
88cc195a2a Merge branch '2016.11' into 'develop' 
No conflicts.
 2017-02-03 10:58:55 -07:00
twangboy
5ff8a14317 Fix problem deleting files 2017-02-02 18:12:18 -07:00
twangboy
4524dd49d4 Remove files not needed by salt-minion 2017-02-02 17:20:12 -07:00
Mike Place
8a24cad919 Merge pull request #39004 from markuskramerIgitt/compile_offline3 
Compile offline3
 2017-02-02 13:20:38 -07:00
Mike Place
75bb1d88eb Merge pull request #39082 from bmwiedemann/systemdsleep 
Add salt-minion.sleep
 2017-02-01 11:57:42 -07:00
Mike Place
4cd698ca33 Merge pull request #39104 from githubcdr/develop 
Do not use name resolving for --notrim check
 2017-02-01 11:25:27 -07:00
cDR
351c039257 Do not use name resolving for --notrim check 
This causes a significant delay on servers with many open connections
 2017-02-01 11:02:10 +01:00
Bernhard M. Wiedemann
c2cef98747 Add salt-minion.sleep 
for use with systemd to be installed in
/usr/lib/systemd/system-sleep/salt-minion.sleep

To avoid stale minion-master connections as described in
https://bugzilla.opensuse.org/show_bug.cgi?id=1018791
 2017-01-31 22:04:04 +01:00
rallytime
8928436bdd Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/pillar/__init__.py
 2017-01-30 09:06:27 -07:00
markuskramerIgitt
b4aa2ffaab Option to compile the Salt-Minion installer offline 2017-01-27 22:52:21 +01:00
Mike Place
4b75dfac95 Merge pull request #38978 from sjorge/2016.11-bootstrap 
fixes saltstack/salt-bootstrap#1021
 2017-01-27 10:05:09 -07:00
rallytime
e91fcbeaac Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/minion.py
  - salt/modules/dockerng.py
  - salt/thorium/key.py
 2017-01-26 16:02:06 -07:00
rallytime
fdaa5ac1b0 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/master.py
  - salt/pillar/__init__.py
  - salt/utils/__init__.py
 2017-01-26 14:09:37 -07:00
Super-User
26eb35f99d fixes salt/salt-bootstrap#1021 2017-01-26 21:22:34 +01:00
twangboy
214e1cc598 Fix 64bit detection, vcredist only on <= 2008 2017-01-24 11:56:11 -07:00
twangboy
62e608b627 Update Jinja2 to 2.9.4 2017-01-24 09:44:23 -07:00
Nicole Thomas
1262fa8ef8 Merge pull request #38843 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-01-20 14:01:12 -07:00
Mike Place
12118fa4eb Merge pull request #38794 from markuskramerIgitt/develop 
Test availability of git in the command shell.
 2017-01-20 13:43:40 -07:00
rallytime
3f74d697b9 Merge branch '2016.11' into 'develop' 
Conflicts:
  - pkg/windows/build_pkg.bat
  - salt/modules/archive.py
 2017-01-20 12:07:19 -07:00
Mike Place
10a3d8b8dd Merge pull request #38726 from twangboy/vcredist 
Add VC Redist 2008 SP1 MFC to installer
 2017-01-19 12:13:41 -07:00
Bo Maryniuk
eb25e2f768 Add a salt-minion service control file 2017-01-18 15:38:53 +01:00
markuskramerIgitt
b25542a66d Version must be set 2017-01-18 02:09:04 +01:00
twangboy
f00a65355d change extensions .ext to .exe 2017-01-17 17:55:18 -07:00
markuskramerIgitt
559bee31f9 no pause 2017-01-17 23:02:10 +01:00
markuskramerIgitt
a789241c0c Add test for git, omit cls to show result of tests. 2017-01-17 22:58:21 +01:00
rallytime
5b43a252c9 Merge branch '2016.11' into 'develop' 
Conflicts:
  - conf/master
  - doc/topics/installation/ubuntu.rst
  - salt/modules/pillar.py
  - salt/netapi/rest_tornado/saltnado.py
  - salt/states/influxdb_user.py
  - salt/utils/minions.py
  - salt/utils/openstack/nova.py
 2017-01-17 09:50:06 -07:00
rallytime
30e8a66fb0 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/netapi/rest_tornado/saltnado.py
  - tests/integration/netapi/rest_tornado/test_app.py
 2017-01-16 18:54:14 -07:00
twangboy
98c40e278c Add VC Redist 2008 SP1 MFC to installer 2017-01-13 12:42:39 -07:00
twangboy
e0c7e5549b Update jinja2 to 2.9.4 2017-01-11 11:10:46 -07:00
rallytime
9ad362fbde Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/states/kapacitor.py
 2017-01-03 10:17:18 -05:00
twangboy
e96bfe8fa2 Change OSX/OS X to macOS where possible 2016-12-28 14:49:46 -07:00
rallytime
a2927226ea Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/modules/all/salt.modules.napalm_route.rst
  - doc/ref/modules/all/salt.modules.napalm_snmp.rst
  - doc/ref/modules/all/salt.modules.napalm_users.rst
  - doc/ref/states/all/salt.states.netsnmp.rst
  - doc/ref/states/all/salt.states.netusers.rst
  - salt/states/cron.py
 2016-12-22 12:15:06 -07:00
rallytime
efb8a8ddf5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - salt/config/__init__.py
  - salt/minion.py
 2016-12-22 10:39:14 -07:00
Michael Calmer
de6ec05ec0 add try-restart to fix autorestarting on SUSE systems 2016-12-21 10:31:18 +00:00
rallytime
494a06bee2 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-12-20 10:03:44 -07:00
Denys Havrysh
c94e798b8a SysV init script for rpm: get and show unique PIDs only 2016-12-14 12:31:42 +02:00
Denys Havrysh
8ff68c4128 Fix initscript for RHEL5 (SysV) to pick up proper python version 2016-11-29 16:23:48 +02:00
Mike Place
468dea6c42 Merge pull request #37858 from cournape/installers/osx/support-maverick 
FEAT: put back support for Maverick in OS X installer.
 2016-11-27 12:54:05 +02:00
David Cournapeau
dcc52ba08a BUG: fix copypasta in preinstall script. 2016-11-24 14:53:04 +00:00
David Cournapeau
6c55e1e7fa Revert "REF: use a variable to reference the pre/post install script output on OS X installer." 
This reverts commit 7180e5ec21.
 2016-11-24 14:52:03 +00:00
Sergey Kizunov
334535bbd3 Make build_pkg.bat work with Python 3.6/3.5/2.7 
Make `build_pkg.bat` and associated utility `portable.py`
compatible with Python 3.6, 3.5, and 2.7.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-11-23 14:24:55 -06:00
David Cournapeau
7180e5ec21 REF: use a variable to reference the pre/post install script output on OS X installer. 2016-11-23 11:48:18 +00:00
David Cournapeau
4265da7b53 BUG: use -w option when unloading salt minion launchd script. 2016-11-23 11:39:30 +00:00
David Cournapeau
8c7a88040f TYPO: fix typo in debug postinstall message in OSX installer. 2016-11-23 11:38:25 +00:00
David Cournapeau
0e8cf75680 FEAT: put back support for Maverick in OS X installer. 
As launchctl CLI interface changed on Yosemite, we execute the more
recent code for Yosemite and later, and introduced back the old code for
post/pre install scripts when running on Maverick.

Tested on Maverick (10.9.5).
 2016-11-23 11:34:42 +00:00
markuskramerIgitt
d594b19cc9 superceded with clean_env.bat 2016-11-18 03:19:12 +01:00