valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
82,455 Commits 24 Branches 182 Tags 341 MiB
26c3441c57
Commit Graph

82455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
26c3441c57 Merge branch 'develop' into merge-develop 2017-05-30 12:56:25 -05:00
Mike Place
21a1b41a42 Merge pull request #41502 from whiteinge/epub-tocdup 
Add epub_tocdup to conf file
 2017-05-30 12:44:19 -05:00
rallytime
8c1dc36a8b Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/modules/zypper.py
  - salt/utils/parsers.py
 2017-05-30 10:20:44 -06:00
Seth House
ebefecea33 Add epub_tocdup to conf file 
http://www.sphinx-doc.org/en/stable/config.html#confval-epub_tocdup
 2017-05-30 10:17:52 -06:00
Nicole Thomas
cbbe1c7c7b Merge pull request #41440 from ecdavis/postgres_schema-respect-opts-test 
postgres_schema: Add support for __opts__['test'] to present and absent states.
 2017-05-30 10:12:35 -06:00
Nicole Thomas
6d2ae48c6e Merge pull request #41488 from arthtux/develop 
Change typo default_passwoord by default_password
 2017-05-30 10:09:21 -06:00
Mike Place
7cd029c9ed Merge pull request #41142 from FedericoCeratto/mysql_cache 
Implement MySQL-based minion data cache
 2017-05-30 10:59:32 -05:00
Mike Place
4b160ab3df Merge pull request #41419 from terminalmage/issue39986 
Add --no-parse CLI option to salt, salt-call, salt-run, and salt-ssh
 2017-05-30 10:55:54 -05:00
Nicole Thomas
f7411393e4 Merge pull request #41495 from isbm/bp-41405 
Takeover from "rallytime:bp-41405"
 2017-05-30 09:11:43 -06:00
Mike Place
660ccbdb4f Merge pull request #41141 from FedericoCeratto/etcd_cache 
Implement etcd based minion data cache
 2017-05-30 10:01:44 -05:00
Bo Maryniuk
50ccc31cf6 Add missing import of fnmatch (lintfix) 2017-05-30 13:28:05 +02:00
Arthur Deschamps
ea3f22dbc3 Change typo default_passwoord by defaut_password 2017-05-29 11:12:30 -04:00
Federico Ceratto
57b91feb25 Implement etcd based minion data cache 2017-05-29 10:51:10 +01:00
Evan Davis
c2235d23c9 Fix test_absent unit test. 2017-05-26 16:11:17 -07:00
Mike Place
cec5af7ce3 Merge pull request #41437 from Ch3LL/fix_gce_net 
Remove ex_subnetwork requirement for GCE
 2017-05-26 17:04:06 -05:00
Mike Place
491d4d941a Merge pull request #41430 from DSRCorporation/bugs/py3_tests_nitrogen 
One more bunch of tests fixes.
 2017-05-26 16:53:37 -05:00
Mike Place
0b6f8437cf Merge pull request #41349 from garethgreenaway/update_network_info_beacon 
Fixes to network_info beacon
 2017-05-26 16:51:39 -05:00
Mike Place
1a74084c38 Merge pull request #41463 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-26 16:35:47 -05:00
Mike Place
8ad172f941 Merge pull request #41457 from cloudflare/napalm-syslog 
Improvements for the napalm syslog engine
 2017-05-26 16:34:39 -05:00
Mike Place
c345ddf111 Merge pull request #41459 from terminalmage/remove-warning 
Remove iproute/ifconfig warning from test suite startup
 2017-05-26 16:26:20 -05:00
Mike Place
e18043e9ec Merge pull request #41468 from terminalmage/py3-tests 
Properly handle strings/bytestrings in Zookeeper/Docker
 2017-05-26 16:15:14 -05:00
Nicole Thomas
f2fc364ffd Merge pull request #41467 from terminalmage/squelch-error 
Squelch spurious error when loader processes slack engine
 2017-05-26 13:48:12 -06:00
Evan Davis
a186af3bb4 Fix postgres_schema unit tests. 2017-05-26 12:45:51 -07:00
Nicole Thomas
b58b36864c Merge pull request #41466 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-05-26 12:45:00 -06:00
rallytime
683b7d2a50 Pylint fixes 2017-05-26 12:43:56 -06:00
Erik Johnson
f0335b6bbe Squelch spurious error when loader processes slack engine 
The of b402743b0a was likely unaware that this would result in this
message being logged every time the loader processes the slack engine.
This moves the logging to the proper place within the __virtual__ func.
 2017-05-26 13:08:30 -05:00
Erik Johnson
f574245a54 Zookeeper expects node values to be bytestrings 2017-05-26 12:59:40 -05:00
Erik Johnson
0d0f802e0d Decode bytestrings returned from docker-py 
This fixes pulls/pushes in Python 3.
 2017-05-26 12:41:49 -05:00
rallytime
ff417db115 Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - doc/topics/venafi/index.rst
  - pkg/salt-proxy@.service
  - salt/config/__init__.py
 2017-05-26 11:27:24 -06:00
rallytime
de85b49b90 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/config/__init__.py
  - salt/modules/cp.py
  - salt/states/saltmod.py
  - salt/utils/__init__.py
  - salt/utils/gzip_util.py
  - tests/integration/shell/test_cp.py
 2017-05-26 11:11:54 -06:00
Evan Davis
a973674082 Remove reference to undefined variable. Oops\! 2017-05-26 10:09:24 -07:00
Nicole Thomas
88c28c18c3 Merge pull request #41350 from lorengordon/issue-41341 
Supports quoted values in /etc/sysconfig/network
 2017-05-26 10:22:03 -06:00
Nicole Thomas
5bb9dac9ec Merge pull request #41413 from gtmanfred/nitrogen 
Write tests for Venafi runner
 2017-05-26 10:09:23 -06:00
Nicole Thomas
d2d5bfef18 Merge pull request #41441 from vitaliyf/patch-3 
Updated docstring in states/libcloud_dns.py
 2017-05-26 10:01:34 -06:00
Nicole Thomas
824f2d3b69 Merge pull request #41398 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-05-26 09:17:48 -06:00
Erik Johnson
843df0a7ef salt-ssh: Only append --no-parse to argv if it contains any arg names 2017-05-26 09:06:25 -05:00
Erik Johnson
3751881f07 Remove iproute/ifconfig warning from test suite startup 
Recent changes in the test suite no longer rely on listing IPv4
addresses to confirm that the daemons have started, so this warning is
now spurious.
 2017-05-26 08:53:14 -05:00
Erik Johnson
a88048da51 Merge pull request #41438 from skizunov/develop3 
opkg: Include reinstalled packages in return dict
 2017-05-26 08:44:41 -05:00
Erik Johnson
ec08064b99 Merge pull request #41442 from UtahDave/fix_args 
use proper arg number
 2017-05-26 08:42:50 -05:00
Mircea Ulinic
084a06a381 Master config for reactor and reactor SLS examples 2017-05-26 13:31:56 +00:00
Mircea Ulinic
4217ef6936 Jump to the next object in the queue on exception 2017-05-26 12:07:23 +00:00
Mircea Ulinic
17af27c709 Documentation small fixes 2017-05-26 12:05:16 +00:00
Mircea Ulinic
e7188f222c Exit when certificate is missing and security is not disabled 2017-05-26 12:03:28 +00:00
Mircea Ulinic
e670d4aa1f Event example and blacklist/whitelist documentation 2017-05-26 12:02:49 +00:00
Mircea Ulinic
4f879e881b Add transport kwargs for future use 2017-05-26 11:34:38 +00:00
Mircea Ulinic
15d3154a27 Import utils __init__ 2017-05-26 11:32:50 +00:00
Mircea Ulinic
cd169281af Add blacklist/whitelist for os, error and host 2017-05-26 11:31:50 +00:00
David Boucha
0324833c9e use proper arg number 2017-05-25 22:55:36 -06:00
Vitaliy Fuks
d9b4d73d28 Updated docstring in states/libcloud_dns.py 
Provided example wasn't valid syntax.
 2017-05-25 22:21:23 -04:00
Evan Davis
a3708c0204 Add support for __opts__['test'] to postgres_schema states. 2017-05-25 16:06:03 -07:00