valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
75,141 Commits 24 Branches 182 Tags 341 MiB
190ec32283
Commit Graph

713 Commits

Author SHA1 Message Date
rallytime
70851807bd Merge branch 'carbon' into 'develop' 
Conflicts:
  - salt/modules/status.py
 2016-10-24 09:35:00 -06:00
Mike Place
3a3838eed9 Merge pull request #37166 from aphor/macports 
upgrade macports salt to v2016.11
 2016-10-24 11:41:18 +09:00
Jeremy McMillan
3cdddcbc87 upgrade macports salt to v2016.11 2016-10-22 11:04:50 -05: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
Mike Place
34007be671
Merge branch 'carbon' into carbon_develop 2016-10-06 00:23:22 +09:00
twangboy
9afed88ed0 Update docs, change final dialog 2016-10-04 16:14:13 -06:00
twangboy
b3083cb139 Add delayed start option to minion service 2016-10-04 14:18:42 -06: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
Erik Johnson
175ba99e0e pkg/salt-minion.service: remove KillMode, change Type to notify 2016-08-18 14:44:51 -05:00
Erik Johnson
540ec28954 pkg/salt-master.service: remove KillMode 2016-08-18 14:44:19 -05:00
Erik Johnson
69fad464ab pkg/salt-api.service: change Type to notify 2016-08-18 14:43:50 -05:00
rallytime
d2340a0aad Merge branch '2016.3' into 'develop' 
Conflicts:
  - pkg/windows/build.bat
  - pkg/windows/build_pkg.bat
  - tests/runtests.py
 2016-08-17 12:13:26 -06:00
Nicole Thomas
e86a39a115 Merge pull request #35516 from rallytime/bp-34441 
Back-port #34441 to 2016.3
 2016-08-17 09:47:23 -06:00
markuskramerIgitt
32da48df08 setup.py will not print each individual file 2016-08-17 08:35:44 -06:00
markuskramerIgitt
698a076a39 Completely remove Python and verify 2016-08-17 08:35:44 -06:00
markuskramerIgitt
7406bd22a6 Errors will stop the scripts 2016-08-17 08:35:44 -06:00
markuskramerIgitt
e47c661cb0 Copy and delete silently, do not list each file 2016-08-17 08:34:06 -06:00
twangboy
c20803de07 Hide minion config page, add master config file 2016-08-15 22:53:27 +00:00
twangboy
d120a8906f Add vcredist 14 dlls 2016-08-10 18:56:08 +00:00
twangboy
00eff0a1a8 Fix architecture detection 2016-08-09 21:26:57 +00:00
twangboy
153b674fc5 Detect 32/64 bit installation 2016-08-09 21:09:36 +00:00
twangboy
23fbc7890c Fix previous version detection 2016-08-09 20:57:33 +00:00
twangboy
e661540526 Fix VC Compiler detection for 32bit Windows 2016-08-09 20:44:47 +00:00
twangboy
978775714b More standardization 2016-08-09 20:11:45 +00:00
twangboy
5787e27af1 Standardize build scripts 2016-08-09 19:53:55 +00:00
twangboy
99ac8acce6 Add path to Python Scripts to build.bat 2016-08-09 19:27:28 +00:00
twangboy
4f78bb0f34 Add path, fix uninstaller 2016-08-09 18:58:58 +00:00
twangboy
8e056168a4 Add function for adding to the path 2016-08-09 17:23:49 +00:00
twangboy
418e649be7 Fix App Paths entries 2016-08-09 17:23:49 +00:00
twangboy
d453199b56 Fix services not starting correctly, use nsExec 2016-08-09 17:23:48 +00:00
twangboy
cc88e50a42 Add Salt-Master to installer 2016-08-09 17:23:47 +00:00
twangboy
9218278873 Fix Title/Subtitle on Minion Config page 2016-08-09 17:23:47 +00:00
twangboy
a860580c79 Change GUID for python 2.7.12 2016-08-09 17:23:47 +00:00
twangboy
31ffb8f6e5 Add dependency dlls to script 2016-08-09 17:23:46 +00:00
twangboy
4149f0c237 Update pip requirements 2016-08-09 17:23:46 +00:00