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
72,620 Commits 24 Branches 182 Tags 341 MiB
3b6f39eb4e
Commit Graph

678 Commits

Author SHA1 Message Date
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
Thayne Harbaugh
aab8e23975 Minor tweaks/improvements to the salt-minion SysV init script. 
* Test "reload" before probing minion configuration
* change indent
 2016-07-28 12:12:45 -06:00
Benedikt Heine
5c45ac10e3 [bash-completion] remove old comment 2016-07-26 23:56:56 +02:00
Benedikt Heine
db58e62b0d [bash-completion] split modules and functions completion 
change behavior to complete modules and functions separately. This helps
gaining overview during completion.
 2016-07-26 23:56:56 +02:00
Benedikt Heine
99871f4c33 [bash-completion] cache function completions 
Cache the function completions. This may be neccessary if timeout is too
high and therefore you may get stuck on your input line.
 2016-07-26 23:56:56 +02:00
Mike Place
b29d3c95a8 Merge pull request #34932 from bebehei/fix-hide-timeout 
[bash-completion] hide timeout in salt-output
 2016-07-26 11:18:59 -06:00
Benedikt Heine
3cd47297ed [bashcompletion] replace ticks with bash subshell 2016-07-26 14:58:59 +02:00
Benedikt Heine
9091f0bffa [bashcompletion] ignore salt-key headers 2016-07-26 14:56:20 +02:00
Benedikt Heine
a7b400e923 [bash-completion] hide timeout in salt-output 
hide timeout and not corrupt the output of salt, when
show_timeout is set in master config
 2016-07-25 21:19:02 +02:00
Mike Place
bb0c7118ba Merge pull request #34502 from markuskramerIgitt/develop 
Windows installer build scripts will exit on error
 2016-07-07 16:05:31 -06:00
markuskramerIgitt
d87277ef89 setup.py will not print each individual file 2016-07-07 23:57:28 +02:00
rallytime
86b7c71e09 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/glusterfs.py
  - salt/states/pkg.py
 2016-07-07 13:37:58 -06:00
markuskramerIgitt
44025e123e Merge branch 'develop' of https://github.com/markuskramerIgitt/salt into develop 2016-07-07 01:29:54 +02:00
markuskramerIgitt
eed5b61dad Completely remove Python and verify 2016-07-07 01:17:16 +02:00
markuskramerIgitt
d464447b86 Errors will stop the scripts 2016-07-07 00:18:01 +02:00
Shane Lee
17a3b23ff8 Use Python 2.7.12 for Windows Build (#34468) 2016-07-06 17:29:50 -04:00
Shane Lee
858e5c1772 Update Python to 2.7.12 for Mac (#34493) 2016-07-06 17:10:53 -04:00
Mike Place
516f494565 Merge pull request #34441 from markuskramerIgitt/develop 
Copy and delete silently, do not list each file
 2016-07-05 22:02:51 -06:00
markuskramerIgitt
7257b8d832 Copy and delete silently, do not list each file 2016-07-02 22:36:49 +02:00
markuskramerIgitt
994d1a3e6a Added description to nsi salt-minion service. 2016-06-22 16:37:55 +02:00
rallytime
9d049e28e5 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/win_pkg.py
  - salt/states/disk.py
 2016-06-15 17:13:26 -06:00
Shane Lee
e4a7190a1d Always make chanes to minion config if set (#34021) 2016-06-15 12:53:42 -04:00
Shane Lee
38e82fb89e Always make changes to minion config if set (#34022) 2016-06-15 12:53:19 -04:00
twangboy
dd7d55afb9 Use full path to python.exe 2016-06-13 12:01:15 -06:00
Mike Place
b9b19b2ca3 Merge pull request #33914 from babilen/salt-api-terminate-cgroup 
Remove KillMode=process from salt-api unit file
 2016-06-10 08:17:39 -07:00
Nicole Thomas
c71b1c0f5c Merge pull request #33913 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-06-09 19:02:28 -04:00
Wolodja Wentland
4763b79479 Remove KillMode=process from salt-api unit file 
Restarting the salt-api service should also terminate processes in the
same context group to ensure that they are being stopped cleanly.
 2016-06-09 21:25:35 +02:00
rallytime
f078d57b57 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/rabbitmq.py
  - salt/modules/win_servermanager.py
  - salt/state.py
  - salt/states/boto_s3_bucket.py
  - salt/states/pip_state.py
  - salt/states/win_servermanager.py
  - tests/unit/modules/win_servermanager_test.py
  - tests/unit/states/dockerng_test.py
 2016-06-09 13:06:10 -06:00
Erik Johnson
62edce685f Merge pull request #33792 from babilen/salt-master-terminate-cgroup 
Do not use KillMode=process for salt-master
 2016-06-09 13:18:56 -05:00
Nicole Thomas
08a584b3e5 Merge pull request #33711 from rallytime/merge-develop-3 
[develop] Merge forward from 2016.3 to develop
 2016-06-09 14:12:48 -04:00
Wolodja Wentland
7975ce009a Do not use KillMode=process for salt-master 
We actually want salt-master processes in the same control group to be
terminated and this was only introduced to fix the 'minion upgrades
itself' problem, which applies to salt-minion, but not to salt-master.

This change was introduced in d288539 to fix #29295, which discusses the
need to include 'KillMode=process' for the salt-minion on Debian
systems.
 2016-06-06 15:36:47 +02:00
EYJ
beea8cc376 Fix millisecond formatting to avoid 1000 as four-digit milliseconds 2016-06-02 17:43:27 +02:00
rallytime
9220ea0729 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - salt/minion.py
  - salt/modules/mac_brew.py
  - salt/modules/pkgng.py
  - salt/states/apache_module.py
  - salt/states/ini_manage.py
  - salt/states/win_servermanager.py
 2016-06-02 10:13:34 -04:00
Clayton Burlison
b483d1d8a6 Update mac native package for upcoming release 
This solves an issue where the package `resources` and package `scripts` were being added to the root of the install drive.

Change Spelling for:
* xCode to XCode
* and capitalize Command Line Tools

to match Apple's offical documentation.

Ref: https://developer.apple.com/xcode/
and https://developer.apple.com/library/ios/technotes/tn2339/_index.html
 2016-06-01 23:32:23 -05:00
Jorge Schrauwen
1064102394 add no-wheel, instructions were failing for someone testing due to wheel being used nog producing an egg 2016-05-28 19:00:42 +02:00