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

75494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
830c03cec6 Don't lose the set reference for ec2 securitygroup ids 
Fixes #38521
 2017-01-09 18:22:16 -07:00
Mike Place
d67f6937d7 Merge pull request #38627 from cachedout/pr-38476 
Pr 38476
 2017-01-06 15:05:45 -07:00
Mike Place
2a423ffedd
Add changes to raetkey 2017-01-06 15:04:54 -07:00
Mike Place
b13cd1370f Merge pull request #38610 from yue9944882/2016.11 
Fix #38595 - Unexpected error log from redis retuner in master's log
 2017-01-06 14:47:21 -07:00
C. R. Oldham
179d385003 Merge pull request #38406 from alex-zel/fix-eauth-groups-permissions 
Fix eauth error with openLDAP/389 directory server groups
 2017-01-06 14:40:29 -07:00
Mike Place
82e9b3d1a1 Merge pull request #38619 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-01-06 10:51:18 -07:00
Mike Place
f64e003a69 Merge pull request #38612 from sjorge/2016.11-solaris-ifacestartswith 
network.ifacestartswith throws exception on Solaris-like platforms
 2017-01-06 10:20:31 -07:00
Mike Place
5820ceee16 Merge pull request #38615 from sjorge/2016.11-solarisdocs 
add note related to issue #37027
 2017-01-06 09:38:33 -07:00
rallytime
0efb2d844e Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/states/archive.py
 2017-01-06 10:28:47 -05:00
Super-User
fbdd32f46b add note related to issue #37027 2017-01-06 15:25:51 +01:00
Super-User
26fae54f5b network.ifacestartswith throws exception on Solaris-like platforms 2017-01-06 10:07:20 +01:00
yue9944882
54325cf293 Fix #38595 - Unexpected error log from redis retuner in master's log 2017-01-06 14:46:14 +08:00
Mike Place
a27fdb46a7 Merge pull request #38598 from terminalmage/issue38459 
Avoid errors when sudo_user is set
 2017-01-05 16:16:21 -07:00
Mike Place
d6b7019df6 Merge pull request #38599 from terminalmage/archive-results-handling 
archive.extracted: Prevent traceback when state.single cannot be run
 2017-01-05 16:16:10 -07:00
Mike Place
da676cebd6 Merge pull request #38601 from terminalmage/pillar-get 
pillar.get: Raise exception when merge=True and default is not a dict
 2017-01-05 16:15:50 -07:00
Mike Place
224fc7712a Merge pull request #38600 from terminalmage/issue38459-2016.3 
Avoid errors when sudo_user is set (2016.3 branch)
 2017-01-05 13:57:08 -07:00
Mike Place
d486b42ceb Merge pull request #38520 from basdusee/fix-issue-38517 
Fix issue #38517, added time.sleep(1) at line 227 in slack.py
 2017-01-05 13:35:08 -07:00
Mike Place
a376970f88 Merge pull request #38589 from tobithiel/fix_rvm_rbenv_warning 
State Gem: fix incorrect warning about missing rvm/rbenv
 2017-01-05 13:12:14 -07:00
Erik Johnson
8613d7254d pillar.get: Raise exception when merge=True and default is not a dict 2017-01-05 13:29:48 -06:00
Erik Johnson
8a45b13e76 Avoid errors when sudo_user is set 
When sudo_user is used, the job is forked into a new pid when sudo is
executed. If a state then tries itself to execute states (such as when a
state invokes state.single), the fact that the forked PID was different
from the PID from which the job was started will cause Salt to refuse to
run the state.

This avoids this by conditionally setting concurrent to True when
invoking states from within states.
 2017-01-05 13:01:58 -06:00
Erik Johnson
9aceb8186d archive.extracted: Prevent traceback when state.single cannot be run 
The error that prompted this should be fixed by #38598, but this will
prevent other possible sources of this issue from triggering a similar
traceback.
 2017-01-05 12:57:53 -06:00
Mike Place
02e6a78254 Merge pull request #38567 from pass-by-value/pgjsonb_queue_changes_2016.3 
Create queue if one doesn't exist
 2017-01-05 11:46:10 -07:00
Mike Place
0706cde626 Merge pull request #38577 from cloudflare/PREP-2016.11.2 
Fix function headers as per #38499
 2017-01-05 11:41:33 -07:00
Erik Johnson
b37f7ffa38 Avoid errors when sudo_user is set 
When sudo_user is used, the job is forked into a new pid when sudo is
executed. If a state then tries itself to execute states (such as when a
state invokes state.single), the fact that the forked PID was different
from the PID from which the job was started will cause Salt to refuse to
run the state.

This avoids this by conditionally setting concurrent to True when
invoking states from within states.
 2017-01-05 12:35:00 -06:00
Mike Place
55d1747792 Merge pull request #38578 from cloudflare/PORT-5123f1 
[2016.11] Port 5123f11 from develop into 2016.11.2
 2017-01-05 11:11:11 -07:00
Mike Place
be69bafe6e Merge pull request #38584 from rallytime/fix-38462 
Allow memusage beacon to load on Windows
 2017-01-05 11:08:30 -07:00
Mike Place
0889cbdb31 Merge pull request #38587 from rallytime/fix-37498 
Change daemontools __virtualname__ from service to daemontools
 2017-01-05 11:06:00 -07:00
Tobias Thiel
9ec470b4a5 State Gem: fix incorrect warning about missing rvm/rbenv 2017-01-05 17:50:51 +01:00
rallytime
2a5880966f Change daemontools __virtualname__ from service to daemontools 
Fixes #37498

When `__virtualname__` is set to `service` in the daemontools execution
module, it overrides the default system-wide service provider. We need
to keep the default service provider, since daemontools is a third-party
service.
 2017-01-05 11:03:50 -05:00
rallytime
1fe945df5e Allow memusage beacon to load on Windows 
As long as python-psutil is installed, this should be able to work.

Fixes #38462

See #38462 for more information.
 2017-01-05 10:05:28 -05:00
Nicole Thomas
14b643fd48 Merge pull request #38570 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-01-05 09:28:37 -05:00
Mircea Ulinic
dea7866d57
Update net.load_template doc: 2016.11.2 2017-01-05 11:24:10 +00:00
Mircea Ulinic
62bee3c793
Fix function headers as per #38499 2017-01-05 11:09:15 +00:00
Bas Dusee
e3a883c915 Small fix on the fix regarding indentation 2017-01-05 11:16:19 +01:00
rallytime
30f14d15df Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/config/__init__.py
  - salt/engines/slack.py
 2017-01-04 16:54:58 -05:00
Aditya Kulkarni
67879ebe65 Create queue if one doesn't exist 2017-01-04 15:40:47 -05:00
Mike Place
9a1550d336 Merge pull request #38509 from mostafahussein/2016.11 
Stop request from being processed if bad ip
 2017-01-04 13:05:43 -07:00
Mike Place
bc07d420e9 Merge pull request #38522 from kkoppel/fix-issue-38518 
Fix usage of salt.utils.http.query in slack_notify.call_hook
 2017-01-04 13:04:56 -07:00
Mike Place
7b74436d13 Merge pull request #38562 from rallytime/arch-install-docs 
Update arch installation docs with correct package name
 2017-01-04 13:04:27 -07:00
Mike Place
01860702cb Merge pull request #38560 from Ch3LL/fix_api_log 
fix api logfile
 2017-01-04 12:03:17 -07:00
rallytime
8b1897ace9 Update arch installation docs with correct package name 
When 2016.11.0 was released, the naming of the salt package was
changed. The salt-zmq version is now named just "salt" and the
salt-raet pacakge is no longer being updated.
 2017-01-04 13:08:47 -05:00
Ch3LL
1b45e9670b fix api logfile 2017-01-04 10:55:13 -07:00
Mike Place
42fef270ee Merge pull request #38527 from rbjorklin/api-timeout-fix 
salt-api no longer forces the default timeout
 2017-01-04 10:10:14 -07:00
Mike Place
1895eb7533 Merge pull request #38529 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-01-04 10:06:56 -07:00
Mike Place
0056620a53 Merge pull request #38531 from rallytime/bp-33601 
Back-port #33601 to 2016.3
 2017-01-04 09:56:52 -07:00
Mike Place
ec4f118ca2 Merge pull request #38539 from twangboy/dsc_int_checks 
Fix DSC LCM Config int checks
 2017-01-04 09:56:26 -07:00
Mike Place
5657fd1956 Add repr flag for str 2017-01-04 08:44:53 -07:00
Mike Place
50242c7f17 Merge pull request #38541 from techhat/issue38187 
Strip user:pass from cached URLs
 2017-01-04 08:39:56 -07:00
Mike Place
53449c89a5 Merge pull request #38549 from meaksh/2016.11-snapper-multiple-subvolumen-support 
Adding multiple SUBVOLUME support and some fixes to the Snapper module
 2017-01-04 08:32:29 -07:00
Mike Place
325dc56e59 Merge pull request #38554 from multani/fix/30454 
Fix YAML deserialization of unicode
 2017-01-04 08:31:16 -07:00