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,722 Commits 24 Branches 182 Tags 341 MiB
c357e37831
Commit Graph

75722 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nicole Thomas
c80b20b957 Merge pull request #19 from whiteinge/batchclient 
Remove batch execution from NetapiClient and Saltnado
 2017-01-06 16:38:54 -05:00
Seth House
3d8f3d18f6 Remove batch execution from NetapiClient and Saltnado 
To be restored once batch execution can support eauth.
 2017-01-06 14:34:07 -07:00
Mike Place
74ddc71be3 Merge pull request #38626 from saltstack/revert-37358-2016.3.3_issue37355 
Revert "Fix/workaround for issue #37355"
 2017-01-06 14:28:08 -07:00
Mike Place
e912ac99c2 Revert "Fix/workaround for issue #37355" 2017-01-06 14:27:57 -07:00
Bo Maryniuk
97b0f64923 Lintfix 2017-01-06 15:29:57 -05:00
Bo Maryniuk
d1516664f7 Add explanation comment 2017-01-06 15:29:51 -05:00
Bo Maryniuk
62f2c87080 Add docstring 2017-01-06 15:29:45 -05:00
Bo Maryniuk
9b0a786aeb Explain what it is about and how to configure that 2017-01-06 15:29:25 -05:00
Bo Maryniuk
5ea3579e10 Pick up a specified roster file from the configured locations 2017-01-06 15:28:05 -05:00
Bo Maryniuk
3a8614c5df Disable custom rosters in API 2017-01-06 15:27:57 -05:00
Bo Maryniuk
c0e5a1171d Add roster disable flag 2017-01-06 15:27:51 -05:00
Mike Place
5e58b32934 Merge pull request #37358 from Firewire2002/2016.3.3_issue37355 
Fix/workaround for issue #37355
 2017-01-06 11:58:47 -07:00
Mike Place
6c2fe615aa Merge pull request #35390 from alexandr-orlov/2016.3 
Returns back missed proper grains dictionary for file module
 2017-01-06 11:02:12 -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
2579cfa42d Merge pull request #38618 from rallytime/bp-38579 
Back-port #38579 to 2016.3
 2017-01-06 10:37:56 -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
2052ecee2c Add copy import 2017-01-06 10:41:29 -05:00
rallytime
0efb2d844e Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/states/archive.py
 2017-01-06 10:28:47 -05:00
Jonathan Ballet
2c8845aaa0 add test for pillar.get() + default value 2017-01-06 10:20:13 -05:00
Jonathan Ballet
c2f98d2f04 ticket 38558: add unit test, deepcopy() only if necessary 2017-01-06 10:19:57 -05:00
marco.messerschmidt
30ae0a1958 added deepcopy of default if merge=True 2017-01-06 10:16:21 -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
e9c59e9b8f Merge pull request #38602 from terminalmage/fix-boto-test 
Fix failing unit.states.boto_vpc_test.BotoVpcRouteTableTestCase.test_present_with_routes
 2017-01-05 16:14:39 -07:00
Erik Johnson
3424a108ac Fix failing unit.states.boto_vpc_test.BotoVpcRouteTableTestCase.test_present_with_routes 2017-01-05 15:41:23 -06: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
1f6b540e46 Make sure the pidfile and log_file values are overriden by api opts 2017-01-05 10:22:05 -05:00
Robin Björklin
04d307f917 salt-api no longer forces the default timeout 
Conflicts:
  - salt/config/__init__.py
 2017-01-05 10:19:56 -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