valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
76,737 Commits 24 Branches 182 Tags 341 MiB
1a9f03ab92
Commit Graph

740 Commits

Author SHA1 Message Date
rallytime
e77e86db3a Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-03-27 17:27:49 -06:00
twangboy
3207d670c5 Fix osx build 2017-03-27 14:52:19 -06:00
rallytime
5c5b74b09a Merge branch '2016.3' into '2016.11' 
Conflicts:
  - pkg/windows/req.txt
 2017-03-22 17:20:58 -06:00
twangboy
6761527793 Update dependencies for PyOpenSSL 2017-03-21 11:03:20 -06:00
cDR
6539dbdbca Do not use name resolving for --notrim check 
This causes a significant delay on servers with many open connections
 2017-03-06 09:06:20 -07:00
twangboy
8dd915dae4 Add salt icon to buildenv directory 2017-02-16 12:04:21 -07: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
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
4b75dfac95 Merge pull request #38978 from sjorge/2016.11-bootstrap 
fixes saltstack/salt-bootstrap#1021
 2017-01-27 10:05:09 -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
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
twangboy
f00a65355d change extensions .ext to .exe 2017-01-17 17:55:18 -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
twangboy
e96bfe8fa2 Change OSX/OS X to macOS where possible 2016-12-28 14:49:46 -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
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
twangboy
08200d2ee8 Update pyzmq to version 16.0.1 2016-11-14 17:12:59 -07:00
twangboy
cf55342150 Update pyzmq to version 15.3.0 2016-11-14 17:11:20 -07:00
rallytime
3b56f8bce1 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/topics/event/master_events.rst
 2016-11-07 08:13:57 -07:00
Michael Calmer
1fb2c4dfcf fix status handling in sysv init scripts 2016-11-06 18:49:12 +01:00
rallytime
9b3e4414c8 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - pkg/windows/modules/get-settings.psm1
  - salt/modules/mac_power.py
  - salt/modules/win_dsc.py
  - salt/modules/win_servermanager.py
  - salt/states/file.py
  - salt/utils/event.py
  - salt/utils/gitfs.py
 2016-11-04 15:23:49 -06:00
Mike Place
edbfadca21 Merge pull request #37442 from twangboy/fix_osx_postinstall 
Create paths.d directory
 2016-11-04 17:07:19 +13:00
twangboy
2de69f48f8 Detect VC for Python correctly on 32bit Windows 2016-11-03 18:23:19 +00:00
twangboy
8091a3065e Create paths.d directory 2016-11-03 09:27:50 -06:00
rallytime
caa8fc9169 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - pkg/deb/salt-api.service
  - pkg/deb/salt-master.service
  - salt/client/__init__.py
  - salt/fileclient.py
  - salt/modules/cp.py
  - salt/modules/status.py
  - tests/integration/__init__.py
  - tests/integration/modules/cp.py
 2016-10-21 15:50:03 -06:00
Erik Johnson
fb6e545f78 Use NotifyAccess=all in all unit files 
When systemd-python is not installed, systemd notification falls back to
using the systemd-notify for service notification. This cannot be used
however unless the unit has NotifyAccess=all set.

The particular use case for this is when Salt is installed using pip. We
don't put systemd-python into the requirements.txt because we can't be
sure that the minion supports systemd, so pip installs won't necessarily
have systemd-python available.
 2016-10-19 12:50:30 -05:00
Erik Johnson
0ccf789172 Remove EnvironmentFile and Restart lines from unit files 
These shouldn't be there, because the variables sourced by the
EnvironmentFile are only made available to the Exec commands in the unit
file.
 2016-10-07 12:33:04 -05:00
Erik Johnson
ddd44e9b13 Use Type=notify for debian systemd units 2016-10-06 09:14:50 -05:00
Robert James Hernandez
036d73f31b Use control-group default for killmode 2016-10-05 10:49:37 -07:00
twangboy
2d697b30c6 Add lxml to deps for Windows (used by win_lgpo) 2016-10-03 17:35:11 -06:00
Mike Place
7b43d4322c
Merge branch '2016.3' into 2016_3_carbon 2016-09-27 16:44:42 +09:00
twangboy
5fc63a1054 Add pyOpenSSL to req file for Windows 2016-09-26 17:35:28 -06:00
twangboy
3baeb2974d Add Estimated Size for Add/Remove Programs 2016-08-24 18:11:49 +00:00
twangboy
2ef1e00888 Add master build package build 2016-08-23 22:41:18 +00:00
twangboy
a3495d0852 Add minion only script 2016-08-23 22:37:17 +00:00
rallytime
b80ef26cf2 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/cli/batch.py
  - salt/minion.py
  - salt/modules/cassandra_cql.py
  - salt/modules/rsync.py
 2016-08-23 10:44:55 -06:00
twangboy
3d6d473d48 Revert to vcredist 12 (2013) 2016-08-22 17:57:14 -06:00
twangboy
10af191a4d Revert to vcredist 12 (2013) 2016-08-22 17:38:50 -06:00
Mike Place
1fb2c03e88 Merge pull request #35474 from twangboy/fix_windows_installer 
Hide minion config page, add master config file
 2016-08-20 12:11:37 +09:00
rallytime
00dff9dcbd Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-18 14:44:12 -06:00
Erik Johnson
6cb0fb47f3 pkg/salt-syndic.service: change Type to notify 2016-08-18 14:45:46 -05:00