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
79,545 Commits 24 Branches 182 Tags 341 MiB
201846ff01
Commit Graph

79545 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
201846ff01 Merge pull request #40129 from terminalmage/py3-tests 
Python 3 compatibility fixes
 2017-03-17 17:49:26 -06:00
Nicole Thomas
6cf624098a Remove unused import for pylint 2017-03-17 17:07:56 -06:00
Nicole Thomas
c4f25ab0a4 Merge pull request #40107 from mchugh19/develop 
Add zabbix proxy updates to zabbix host state
 2017-03-17 15:13:47 -06:00
Nicole Thomas
0030e76f08 Merge pull request #40121 from mirceaulinic/patch-4 
Add table outputter to Nitrogen
 2017-03-17 15:11:36 -06:00
Christian McHugh
e8dc31df78 correct pylint warnings 2017-03-17 18:08:46 +00:00
Mike Place
cc69f79e26 Merge pull request #40124 from alexbleotu/proxy_dunder_injection-gh 
Proxy dunder injection gh
 2017-03-17 12:07:15 -06:00
Mike Place
064f630d93 Merge pull request #40030 from narendraingale2/upstream2/fix_39445 
Added changes for fix_39445
 2017-03-17 12:05:46 -06:00
Mike Place
6c33e8ea6b Merge pull request #40087 from quixoten/add-gpg-ext-pillar 
Add gpg ext pillar to decrypt all pillar data
 2017-03-17 11:34:01 -06:00
Mike Place
6e4ca32ac3 Merge pull request #40110 from DarkKnightCZ/psql-40108 
Add optional 'write' attribute in postgres.psql_query
 2017-03-17 11:32:48 -06:00
Mike Place
60d414dd6f Merge pull request #40106 from timreinders/develop 
jnpr.junos.device.Device expects 'ssh_private_key_file' as optional a…
 2017-03-17 11:03:57 -06:00
Erik Johnson
896387256e Remvove incompatible python3 code 
Encoding creates a bytestring, when we need a string here.
 2017-03-17 11:50:06 -05:00
Mike Place
9d7cdbfac3 Merge pull request #40115 from DarkKnightCZ/ssh-40114 
Mark ssh_auth.present state as failure when public key is invalid
 2017-03-17 10:35:04 -06:00
Erik Johnson
c17a8cb239 Pass arguments as list, and also more sanely touch /etc/machine-info 2017-03-17 11:33:41 -05:00
Mircea Ulinic
db006b274c Add table outputter to Nitrogen 2017-03-17 15:59:52 +00:00
Christian McHugh
5726a59900 Merge branch 'develop' of https://github.com/saltstack/salt into develop 2017-03-17 15:33:25 +00:00
Nicole Thomas
f29f65a759 Merge pull request #40099 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-03-17 09:18:33 -06:00
Alexandru Bleotu
3de6290e32 Invoked reload_modules before initializing the ProxyMinion so all dunders are injected 2017-03-17 14:56:51 +00:00
Alexandru Bleotu
b2dff38223 Added reload_modules function to LazyLoader 2017-03-17 14:56:45 +00:00
Lukas Raska
a4c565c621 Mark ssh_auth.present state as failure when public key is invalid 2017-03-17 15:22:40 +01:00
Lukas Raska
94a9734b14 Add optional 'write' attribute in postgres.psql_query to start RW transaction 2017-03-17 14:32:36 +01:00
Christian McHugh
bb4e9fe733 Add zabbix proxy updates to host state 2017-03-17 12:21:26 +00:00
Tim Reinders
7f08aa4e3a jnpr.junos.device.Device expects 'ssh_private_key_file' as optional argument, not 'ssh_private_key' 2017-03-17 11:09:44 +01:00
Erik Johnson
9b71ff7ba4 PY3 compatibility: str does not have a 'decode' attr as it only stores unicode 2017-03-16 23:16:35 -05:00
Erik Johnson
24e2e17b5e Use salt.utils.to_str instead of bytes.decode 2017-03-16 23:05:22 -05:00
Erik Johnson
0158228315 PY3 compatibility: Ensure bytes generated by pycrypto are decoded to str 2017-03-16 22:40:31 -05:00
Erik Johnson
8676f7d14a Add pip3 to list of commands in which_bin test 2017-03-16 22:07:52 -05:00
Erik Johnson
a81fb1bb15 PY3 compatibility: write bytestring when file opened with 'wb' 2017-03-16 21:41:23 -05:00
rallytime
caebd5d8cf Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/topics/targeting/nodegroups.rst
  - salt/runners/manage.py
 2017-03-16 17:23:57 -06:00
Mike Place
b3415bc8fc Merge pull request #40039 from msciciel/module-sysctl-avoid-multiple-listings 
Avoid listing all sysctl in linux_sysctl module
 2017-03-16 15:25:45 -06:00
Mike Place
0bdf240dcc Merge pull request #40049 from bodhi-space/infra4506 
INFRA-4506 - boto_lambda: add ability to pass SecurityGroupNames and SubnetNames in VpcConfig dict
 2017-03-16 15:21:50 -06:00
Mike Place
cf8dd2ce29 Merge pull request #40066 from jeanpralo/dockercompose-remove-max-version-check 
Remove max version check on dockercompose
 2017-03-16 15:01:48 -06:00
Mike Place
9ef3e070c2 Merge pull request #40077 from cloudflare/fix-39771 
Fix #39771 (Empty __proxy__ dunder inside scheduler)
 2017-03-16 14:56:01 -06:00
Mike Place
c1002a6928 Merge pull request #40067 from techhat/runnerfetch 
Add fetch function to cache runner
 2017-03-16 14:53:41 -06:00
Mike Place
24d52ff66b Merge pull request #40080 from cloudflare/statuspage-update 
Improvements for the statuspage state
 2017-03-16 14:46:16 -06:00
Mike Place
d5040a1c25 Merge pull request #40082 from cloudflare/update-capirca 
Capirca should be able to use non-int ports
 2017-03-16 14:44:53 -06:00
Mike Place
a870383387 newline for lint 2017-03-16 14:39:10 -06:00
Nicole Thomas
b12720a56f Merge pull request #40088 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-03-16 13:58:43 -06:00
Erik Johnson
6b7ba07841 PY3 compatibility: don't use cmp in sorted() 2017-03-16 14:49:47 -05:00
Nicole Thomas
d64dee46bd Merge pull request #40061 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-03-16 11:16:52 -06:00
Erik Johnson
3923305141 Sort list of minions in batch to make tests consistent 2017-03-16 12:00:38 -05:00
rallytime
626bd03885 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/runners/manage.py
 2017-03-16 10:43:18 -06:00
Devin Christensen
dc0dbb5949 Fix documentation 2017-03-16 10:41:04 -06:00
Nicole Thomas
703ab23953 Merge pull request #40055 from rallytime/doc-build-warnings 
Update "yaml" code-block references with "jinja" where needed
 2017-03-16 10:30:37 -06:00
Devin Christensen
63491b5e6d Add gpg ext pillar to decrypt all pillar data 2017-03-16 10:24:44 -06:00
Mircea Ulinic
e2da56c6b8 Strip unused import 2017-03-16 16:14:00 +00:00
Mircea Ulinic
451b9e70e5 Avoid global 2017-03-16 15:55:05 +00:00
Nicole Thomas
d36bdb1a6e Merge pull request #40070 from Ch3LL/2016.3.6_release 
update 2016.3.6 release notes with additional PR's
 2017-03-16 09:43:21 -06:00
Nicole Thomas
e73a1d0e54 Merge pull request #40072 from meaksh/2016.11-handling-timeouts-for-manage.up-runner 
[2016.11] Allows overriding 'timeout' and 'gather_job_timeout' to 'manage.up' runner call
 2017-03-16 09:31:46 -06:00
Nicole Thomas
39a6392fa2 Merge pull request #40079 from cloudflare/add-logmod-doc 
Add logmod doc
 2017-03-16 09:12:29 -06:00
Mircea Ulinic
7410f201bd Fix netacl state doc 2017-03-16 15:04:26 +00:00