valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
68,859 Commits 24 Branches 182 Tags 341 MiB
914eb60d51
Commit Graph

68859 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tanky Woo
914eb60d51 Fix iptables target options with no arguments 
For example:

  - name: test
    jump: CT
    notrack: ''
    ...
 2016-08-16 16:00:00 +08:00
Mike Place
607169a01b Merge pull request #35412 from s0undt3ch/2016.3 
Only allow one sync read to happen at a time.
 2016-08-13 08:57:29 +09:00
Nicole Thomas
2ef596673f Provide links to the renderers in the template docs (#35406) 
* Provide links to the renderers in the template docs

Follow-up for #35360, also references #35336

* Whitespace fix
 2016-08-12 12:27:44 -06:00
Mike Place
b3e9e98b40 Merge pull request #35393 from deniszh/2016.3_fix35350 
No need to run ddns update every time
 2016-08-12 21:40:36 +09:00
Mike Place
a5fe05b7f9 Merge pull request #35407 from hu-dabao/fix-35094 
[Fix-35094] None will not be added to grains which generate [none]
 2016-08-12 21:34:05 +09:00
Mike Place
4dc776ffbf Merge pull request #35411 from eliasp/2016.3-modules.event-handle-file_client-opt 
modules.event.send(): Prevent backtrace for masterless Minions
 2016-08-12 21:29:01 +09:00
Pedro Algarvio
f54b3cc514
Only allow one sync read to happen at a time. 2016-08-12 12:19:09 +01:00
Elias Probst
8d7244bdd9
modules.event.send(): Also check for file_client and use_master_when_local opts 2016-08-12 12:27:02 +02:00
Hengyang Hu
a23108f795 None will not be added to grains which generate [none] 2016-08-11 16:20:37 -07:00
Nicole Thomas
c032506e6b Merge pull request #35395 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-11 14:59:37 -06:00
rallytime
0d1aa630f1 Lint fix 2016-08-11 13:13:51 -06:00
rallytime
cf038ee3fe Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/grains/core.py
  - salt/modules/file.py
  - salt/modules/hosts.py
  - salt/modules/inspectlib/collector.py
  - salt/modules/portage_config.py
  - salt/modules/x509.py
  - salt/scripts.py
  - tests/integration/shell/enabled.py
 2016-08-11 11:33:54 -06:00
Nicole Thomas
d9c20c0456 Update freebsd.rst (#35394) 
Updated FreeBSD installation instructions to remove ``priority`` definition. 
(This, I believe, should address an issue submitted in saltstack/salt-bootstrap/issues/908)
 2016-08-11 11:00:36 -06:00
Mike Place
69a108e9fa Raise SaltRenderError on bad requisite (#35373) 
* Raise SaltRenderError on bad requisite

Refs #35226

* Remove extra vals
 2016-08-11 10:48:23 -06:00
Erik Johnson
a375dd7e1f Clean up open filehandles (#35359) 
* salt/crypt.py: clean up open filehandles

* salt/fileclient.py: clean up open filehandles

* salt/grains/core.py: clean up open filehandles

* salt/modules/cp.py: clean up open filehandles

* salt/modules/data.py: clean up open filehandles

* salt/modules/dnsutil.py: clean up open filehandles

* salt/modules/dockerng.py: clean up open filehandles

* salt/modules/inspectlib/collector.py: clean up open filehandles

* salt/modules/file.py: clean up open filehandles

* salt/modules/hosts.py: clean up open filehandles

* salt/modules/incron.py: clean up open filehandles

* salt/modules/dpkg.py: clean up open filehandles

* salt/modules/linux_sysctl.py: clean up open filehandles

* salt/modules/netbsd_sysctl.py: clean up open filehandles

* salt/modules/network.py: clean up open filehandles

* salt/modules/nftables.py: clean up open filehandles

* salt/modules/openbsd_sysctl.py: clean up open filehandles

* salt/modules/rh_ip.py: clean up open filehandles

* salt/modules/portage_config.py: clean up open filehandles

* salt/modules/status.py: clean up open filehandles

* salt/modules/tls.py: clean up open filehandles

* salt/modules/xapi.py: clean up open filehandles

* salt/modules/x509.py: clean up open filehandles

* salt/modules/virt.py: clean up open filehandles

* salt/modules/zcbuildout.py: clean up open filehandles

* salt/returners/local_cache.py: clean up open filehandles

* salt/utils/cloud.py: clean up open filehandles

* salt/states/pkgrepo.py: clean up open filehandles

* salt/states/x509.py: clean up open filehandles

* salt/transport/mixins/auth.py: clean up open filehandles

* salt/utils/__init__.py: clean up open filehandles

* salt/states/pkg.py: clean up open filehandles

* salt/utils/minion.py: clean up open filehandles

* salt/utils/openstack/nova.py: clean up open filehandles

* salt/utils/openstack/swift.py: clean up open filehandles

* salt/utils/process.py: clean up open filehandles

* salt/utils/templates.py: clean up open filehandles

* salt/utils/virt.py: clean up open filehandles

* tests/integration/__init__.py: clean up open filehandles

* tests/integration/cli/grains.py: clean up open filehandles

* tests/integration/client/standard.py: clean up open filehandles

* tests/integration/modules/hosts.py: clean up open filehandles

* tests/unit/utils/vt_test.py: clean up open filehandles

* tests/integration/shell/enabled.py: clean up open filehandles

* tests/integration/states/cmd.py: clean up open filehandles

* tests/integration/states/file.py: clean up open filehandles

* tests/integration/states/match.py: clean up open filehandles

* tests/unit/config_test.py: clean up open filehandles

* tests/unit/templates/jinja_test.py: clean up open filehandles

* tests/unit/utils/find_test.py: clean up open filehandles

* tests/integration/modules/state.py: clean up open filehandles

* Update dnsutil_test to reflect changes in fopen usage
 2016-08-11 10:45:24 -06:00
Denis Zhdanov
6f2f080f4a No need to run dns update every time 
only if we replacing record or it doesn't exist.
 2016-08-11 18:25:47 +02:00
Thomas S Hatch
9ea7a34c30 Merge pull request #35339 from isbm/isbm-2015.8-minion-importerror-fix 
Bugfix: Prevent continuous restart, if a dependency wasn't installed
 2016-08-11 10:15:16 -06:00
Bo Maryniuk
12af60b7be Fix continuous minion restart if a dependency wasn't installed 2016-08-11 12:18:19 +02:00
Mike Place
72f3548671 Merge pull request #35352 from twangboy/file.recurse.clean 
Fix file.recurse with clean: True  on Windows (2016.3)
 2016-08-11 09:46:11 +09:00
Mike Place
0fcfc70cc8 Merge pull request #35356 from jfindlay/log_levels 
document log levels and warn on all logging below info
 2016-08-11 09:45:55 +09:00
Mike Place
fd9b05ace4 Merge pull request #35357 from twangboy/file.recurse.clean.2015.8 
Fix file.recurse with clean: True  on Windows (2015.8)
 2016-08-11 09:44:14 +09:00
Mike Place
2f7be03053 Merge pull request #35358 from twangboy/update_libsodium_deps 
Update libsodium deps
 2016-08-11 09:36:29 +09:00
Mike Place
f9e03b9c59 Merge pull request #35360 from rallytime/fix-35336 
Add all template registery templates to file.managed docs
 2016-08-11 09:35:20 +09:00
Mike Place
3c628d3cbc Merge pull request #35362 from rallytime/correct-deprecated-tag 
Correct deprecation version tags
 2016-08-11 09:34:38 +09:00
rallytime
507827a014 Correct deprecation version tags 
Deprecation tags should denote when the function was placed on a
deprecation path, not when it will be removed. This PR fixes the
version information as well as changes the warning messaging to
function-specific wording rather than the module getting removed.
(The module won't fully be removed until Oxygen.)

See #35361 for more information.
 2016-08-10 15:00:07 -06:00
rallytime
30badb5402 Add all template registery templates to file.managed docs 
Fixes #35336
 2016-08-10 14:29:12 -06:00
Justin Findlay
2fc3a55338 utils.verify.verify_log: warn at all levels less than info 2016-08-10 14:10:43 -06:00
Justin Findlay
72a3f18a2e log.setup: minor optimization 2016-08-10 14:10:43 -06:00
Justin Findlay
66332510c6 doc.ref.configuration.logging: document log levels 2016-08-10 14:10:43 -06:00
Nicole Thomas
87e29188c0 Merge pull request #35347 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-10 14:07:42 -06:00
twangboy
d328ec0157 Fix file.recurse with clean: True 2016-08-10 19:01:05 +00:00
twangboy
d120a8906f Add vcredist 14 dlls 2016-08-10 18:56:08 +00:00
twangboy
ecad616d08 Fix file.recurse with clean: True 2016-08-10 17:49:02 +00:00
Justin Findlay
93616eff3e doc.ref.configuration.logging: fix formatting 2016-08-10 10:47:07 -06:00
Justin Findlay
472a2d31de doc.ref.configuration.logging: cleanup formatting 2016-08-10 10:46:39 -06:00
rallytime
a651962e95 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-10 10:02:03 -06:00
Mike Place
3487d761a2 Restore random_master functionality (#35334) 
Was errantly removed in 80b1d60f4c
 2016-08-10 09:37:08 -06:00
Mike Place
78dfd18ec6 Merge pull request #35331 from hu-dabao/fix-35165 
fix 35165, salt-run jobs.exit_success jid is broken
 2016-08-10 20:50:10 +09:00
Mike Place
fcca0b9333 Merge pull request #35318 from rallytime/remove-deprecation-docs 
Remove legacy compat docs in mysql pillar since the code was removed already
 2016-08-10 20:34:48 +09:00
Mike Place
4618b433e9 Merge pull request #35323 from thatch45/ssh_crazy 
Fix issue with bad error check in salt-vt
 2016-08-10 20:33:49 +09:00
Mike Place
cfae862972 Merge pull request #35325 from kev009/fbsd-netstat-route 
Fix freebsd netstat route on fbsd 10+
 2016-08-10 20:33:12 +09:00
Mike Place
3446dc9ec6 Merge pull request #35329 from hu-dabao/fix-tiny-salt-cli 
sys.doc will skip all not connected minions
 2016-08-10 20:18:22 +09:00
Hengyang Hu
4dcce18d01 fix 35165, salt-run jobs.exit_success jid is broken 2016-08-09 22:36:21 -07:00
Hengyang Hu
4b806a70ea sys.doc will skip all not connected minions 2016-08-09 21:00:05 -07:00
Kevin Bowling
0d49dd3c29 Fix fbsd netstat route on fbsd 10+ 2016-08-09 18:41:34 -07:00
Thomas S Hatch
8a5b47b5d7 Collect all error data from the wfuncs call 2016-08-09 17:39:14 -06:00
Thomas S Hatch
11864c31b7 supress a stack trace to show clean ssh error 2016-08-09 17:24:56 -06:00
Thomas S Hatch
9fbfa282fa wow this solves an issue! 2016-08-09 17:05:22 -06:00
rallytime
75f205e485 Remove legacy compat docs in mysql pillar since the code was removed already 
Refs #30913
 2016-08-09 15:27:11 -06:00
Ivan Babrou
244c3bd495 Pass port to ssh.check_known_host, closes #35264 (#35301) 2016-08-09 13:16:01 -06:00