valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
76,314 Commits 24 Branches 182 Tags 341 MiB
049161dcd0
Commit Graph

76314 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Wallace
9caf0b406d use sleep from path for docker.sls_build 
sleep sometimes is found in /bin/sleep, like in ubuntu.  We should just
depend on the PATH variable being correct, and finding sleep, instead of
explicitly saying /usr/bin/sleep
 2016-11-30 10:17:30 -06:00
Mike Place
0af7bd527d Merge pull request #37989 from alexbleotu/schema_updates-gh 
Schema updates gh
 2016-11-30 09:06:49 -07:00
Nicolas Delaby
c5c7a53d72 Remove initdb dependency to consume postgres module. 2016-11-30 17:06:17 +01:00
Mike Place
c8380cf2c9 Merge pull request #37953 from m03/another-set-of-aptpkg-tests 
Additional aptpkg module unit tests
 2016-11-30 09:02:21 -07:00
Mike Place
8f351644b5 Merge pull request #37960 from rallytime/proxy-grains-merge-switch 
Switch proxy_merge_grains_in_module option default from False to True
 2016-11-30 09:00:56 -07:00
Mike Place
b0d090ecfd Merge pull request #37967 from Cybolic/fix_ec2_drive_setup 
Fixed faulty logic preventing instance initialisation.
 2016-11-30 07:40:57 -07:00
Mike Place
8b3a01b3d7 Merge pull request #37973 from rallytime/nitrogen-deprecations-saltapi-class 
[Nitrogen Deprecation] Remove SaltAPI.run() function
 2016-11-30 07:40:09 -07:00
Mike Place
d764e3e24b Merge pull request #37974 from rallytime/nitrogen-beacon-deprecation 
[Nitrogen Deprecation] Beacons config should be a list not a dict now
 2016-11-30 07:36:26 -07:00
Mike Place
a38c721290 Merge pull request #37977 from rallytime/nitrogen-deprecation-ssh-wipe 
[Nitrogen Deprecation] Remove warning/support for wipe_ssh
 2016-11-30 07:36:03 -07:00
Mike Place
ca3a9488f1 Merge pull request #37979 from terminalmage/revert-pillar-change 
Revert addition of pillar_roots_override_ext_pillar
 2016-11-30 07:34:23 -07:00
Mike Place
2738e61a03 Merge pull request #37983 from m03/improve-refresh_db-failhard_1 
Improve aptpkg.refresh_db failhard param
 2016-11-30 07:33:37 -07:00
Mike Place
f89530a79c Merge pull request #37988 from alexbleotu/wait_for_task_invalid_argument-gh 
Wait for task invalid argument gh
 2016-11-30 07:31:29 -07:00
Mike Place
fa41fa06cb Remove whitespace for lint check 2016-11-30 07:30:12 -07:00
Robin Björklin
7440582ce8 consul_pillar support for limiting pillar exposure via minion targeting 2016-11-30 12:47:37 +01:00
m03
dd4395582d Add integrity to pkg.refresh_db failhard param 2016-11-29 18:44:49 -08:00
Erik Johnson
c3e85e9967 Add absolute_import to please pylint 2016-11-29 20:37:47 -06:00
Steve Groesz
0039ff141f Update ssh.py 
fixes #37948
 2016-11-29 20:04:44 -06:00
Erik Johnson
26600bcd0d Forgot a word in docs update 2016-11-29 15:52:04 -06:00
Erik Johnson
6135dfa4dd Revert addition of pillar_roots_override_ext_pillar 
This turned out to be an unnecessary addition, as the root cause was
ext_pillar_first not behaving as documented.
 2016-11-29 15:35:04 -06:00
Nicole Thomas
186b3c7959 Fix RST link format (#37958) (#37970) 2016-11-29 14:34:07 -07:00
rallytime
c890eeb9bc [Nitrogen Deprecation] Remove warning/support for wipe_ssh 
This should be ``ssh_wipe`` instead.

See PR #30634 for more information.
 2016-11-29 14:29:58 -07:00
rallytime
00d2f994ef [Nitrogen Deprecation] Beacons config should be a list not a dict now 
Change the deprecation warning to raising an error when a dict is used
 2016-11-29 14:19:37 -07:00
rallytime
ac8524fb91 [Nitrogen Deprecation] Remove SaltAPI.run() function 
Also remove reference to SaltAPI.run() call and move to SaltAPI.start()
call instead in integration/__init__.py
 2016-11-29 14:18:40 -07:00
Nicole Thomas
6976be4b9a Pylint fix (#37971) 2016-11-29 14:02:43 -07:00
twangboy
12fc0b7236 Fix some lint 2016-11-29 14:02:00 -07:00
rallytime
3ab6adec9f Pylint fix and import clean up 2016-11-29 13:58:34 -07:00
Nicole Thomas
2723188c6f Merge pull request #37956 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2016-11-29 13:52:38 -07:00
m03
8d5ce68b55 Address config.get in autoremove and upgrade 2016-11-29 12:48:02 -08:00
Mircea Ulinic
3cda665640 Fix RST link format (#37958) 2016-11-29 13:24:14 -07:00
Erik Johnson
f7acb34248 Deprecate expr_form argument in the LocalClient 
The published commands and the events all use tgt_type, expr_form is
only used in the LocalClient, which has been confusing to many users.
This puts expr_form on a deprecation path, allowing it to continue to be
supported while tgt_type becomes the new official argument name.
 2016-11-29 14:03:34 -06:00
Christian Dannie Storgaard
94c5f746f5 Fixed faulty logic preventing instance initialisation. 2016-11-29 21:01:38 +02:00
Mike Place
c2872d5da6 Merge pull request #37957 from cachedout/remove_joyent_test 
Remove Joyent test
 2016-11-29 11:08:49 -07:00
rallytime
62e3c44045 Switch proxy_merge_grains_in_module option default from False to True 2016-11-29 10:51:46 -07:00
rallytime
acc87286d3 Pylint fix 2016-11-29 10:29:06 -07:00
Mike Place
ce9836adb3 Merge pull request #37333 from benediktwerner/fix-state-salt-runner-return 
Fixed state.salt.runner() reporting success on exceptions
 2016-11-29 10:13:08 -07:00
Mike Place
b341357942
Remove Joyent test 
Removed per https://github.com/saltstack/salt/pull/37756#issuecomment-263618695
 2016-11-29 09:54:46 -07:00
Mike Place
856407ee27 Merge pull request #37951 from gtmanfred/develop 
retry states didn't make it into carbon
 2016-11-29 09:51:21 -07:00
Mike Place
36f91408c5 Merge pull request #37946 from scott-w/37935-fix-bin-dir 
Updated the bins_dir to default to pg_bin
 2016-11-29 09:48:27 -07:00
rallytime
4760455600 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/grains/core.py
  - salt/modules/dockerng.py
  - tests/unit/modules/linux_acl_test.py
 2016-11-29 09:31:05 -07:00
Thomas S Hatch
d8650c5474 Merge pull request #37889 from isbm/isbm-states-archive-fix 
Allow overwrite archives extraction
 2016-11-29 09:18:57 -07:00
m03
001d1b615f Additional aptpkg module unit tests 2016-11-29 08:18:08 -08:00
Thomas S Hatch
e2b9e58d30 Merge pull request #37869 from isbm/isbm-input-sanitation-16.11 
Input sanitation (16.11)
 2016-11-29 09:17:16 -07:00
Daniel Wallace
6658c2f12b retry states didn't make it into carbon 
Update the version to Nitrogen
 2016-11-29 10:09:47 -06:00
Scott Walton
d33d403969 Restored missing initdb #37935 
Realised I missed off the initdb check so I've restored it as before.
 2016-11-29 15:43:57 +00:00
Scott Walton
a041b9f8e8 Use Salt deprecation warning #37935 2016-11-29 15:39:47 +00:00
Scott Walton
a96789353f Updated the bins_dir to default to pg_bin #37935 
The config looking for initdb wasn't consistent with documentation so this updates that. It might be best to add a default but I need to look into the code a bit more first.
 2016-11-29 15:39:47 +00:00
Mike Place
c97bee2f40 Merge pull request #37832 from hu-dabao/add-current-masters 
add connected_masters to salt.utils.minion and refactor status.master
 2016-11-29 07:59:56 -07:00
Mike Place
3cef1083a6 Merge pull request #37944 from cloudflare/INCLUDE-NAPALM 
Include NAPALM in 2016.11 release notes
 2016-11-29 07:49:19 -07:00
Mike Place
c25a306759 Merge pull request #37647 from americanexpress/cron-non-root 
Revising cron for OS agnostic support of cron when running non-root
 2016-11-29 07:33:48 -07:00
Mircea Ulinic
529b64dbeb
Inclued NAPALM in 2016.11 release notes 2016-11-29 13:46:45 +00:00