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,160 Commits 24 Branches 182 Tags 341 MiB
8b3a01b3d7
Commit Graph

76160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
m03
dd4395582d Add integrity to pkg.refresh_db failhard param 2016-11-29 18:44:49 -08: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
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
Mircea Ulinic
3cda665640 Fix RST link format (#37958) 2016-11-29 13:24:14 -07: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
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
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
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
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
Alexandru Bleotu
07979897b6 Added tests for InvalidArgument fault handling in utils.vmware.wait_for_task 2016-11-29 05:23:07 -05:00
Alexandru Bleotu
a6aab8c657 Handled InvalidArgument fault in utils.vmware.wait_for_task 2016-11-29 05:22:43 -05:00
Mike Place
3277e63556 Merge pull request #37801 from cloudflare/MORE-FILTERS 
More Jinja IP filters
 2016-11-28 15:50:20 -07:00
Mike Place
76658631f9 Merge pull request #37904 from terminalmage/issue37698 
Add states to manage systemd masking
 2016-11-28 15:46:06 -07:00
Mike Place
c3bf3311e9 Merge pull request #37743 from discountbin/develop 
Adding check for ignore_if_missing param when calling _check_file.
 2016-11-28 15:40:02 -07:00
Mike Place
66ee3b32b7 Remove unused import 2016-11-28 15:25:12 -07:00
Mike Place
e539a94a56 Merge pull request #37884 from isbm/isbm-zypper-gpgkey-pkg-filter 
Do not include "gpg-pubkey" packages, filtering by their name
 2016-11-28 14:11:37 -07:00
Mike Place
eb7b1e8a9c Merge pull request #37833 from vodik/jenkins-run 
Add jenkins.run
 2016-11-28 14:11:05 -07:00
Mike Place
eb3d81a1de Merge pull request #37882 from attiasr/fix_missing_tags 
multiple issues in boto_rds state and module
 2016-11-28 14:09:11 -07:00
Bo Maryniuk
f9ec5d68af Use six instead of builtins 2016-11-28 22:04:53 +01:00
Mike Place
9cab761320 Merge pull request #37909 from thusoy/invalid-timezone 
Throw error when setting invalid timezone
 2016-11-28 14:04:35 -07:00
Bo Maryniuk
203dfcb238 Use American spelling instead 2016-11-28 22:02:44 +01:00
Mike Place
a3d10b986b Merge pull request #37908 from gtmanfred/stalekey 
variable is not always set for stalekey engine
 2016-11-28 13:52:34 -07:00
Nicole Thomas
8f986b28dc Remove release candidate doc ref from 2016.11.0 release notes (#37931) 2016-11-28 13:49:28 -07:00
Mike Place
754f6deb1a Merge pull request #37910 from m03/fix-37897-pkg-refresh_db 
Fix for #37897 aptpkg.refresh_db inaccurate results
 2016-11-28 13:48:51 -07:00
Mike Place
44306dd8a5 Merge pull request #37913 from gtmanfred/develop 
Add ircbot engine for sending events to the reactor
 2016-11-28 13:38:11 -07:00
Thomas S Hatch
3d2dabc7b7 Merge pull request #37930 from cachedout/fix_comp 
Remove dictionary comprehension in netusers
 2016-11-28 13:27:06 -07:00
Mike Place
670e83200b
Remove dictionary comprehension in netusers 2016-11-28 13:24:44 -07:00
Mike Place
ac8b18570c Merge pull request #37920 from cro/nohostname_stacktrace 
Prevent FreeBSD minion from stacktracing on start if hostname not configured
 2016-11-28 13:10:37 -07:00
Nicole Thomas
0f8b187d15 Merge pull request #37923 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-11-28 12:55:03 -07:00
Thomas S Hatch
14271156f6 Add a release notes reference to the docker-sls tutorial (#37927) 2016-11-28 12:54:17 -07:00
Daniel Wallace
4d9722fb45 Add ircbot engine for sending events to the reactor 
More to be added later like triggering commands from irc.
 2016-11-28 13:12:42 -06:00
Nicole Thomas
6fd6c3516a Merge pull request #37919 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2016-11-28 12:05:39 -07:00
rallytime
da7f5518eb Don't let 2016.3 doc config changes overwrite the 2016.11 changes 2016-11-28 11:09:35 -07:00
rallytime
dfedd1185a Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/grains/core.py
  - salt/modules/ddns.py
  - salt/templates/rh_ip/network.jinja
 2016-11-28 11:08:19 -07:00
rallytime
b3340c3a73 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/conf.py
  - salt/config/__init__.py
  - salt/minion.py
 2016-11-28 10:40:47 -07:00
C. R. Oldham
c4a9d95eba Prevent FreeBSD minion from stacktracing on start if hostname not configured 2016-11-28 10:26:22 -07:00