Commit Graph

79585 Commits

Author SHA1 Message Date
Mircea Ulinic
186a6c4f2a Add proxy options doc 2017-03-21 14:59:16 +00:00
Mircea Ulinic
97343733ad Proxy config Examples 2017-03-21 14:59:16 +00:00
Mircea Ulinic
1ba599b784 Include proxy config instructions 2017-03-21 14:59:11 +00:00
Pedro Algarvio
8f462b6331 Merge pull request #40094 from twangboy/win_fix_testing
Fix problems with the test suite on Py3
2017-03-20 22:14:29 +00:00
Mike Place
c1408205ba Merge pull request #40103 from YuriGrigorov/40022
Allow scheduled job to run if run time is in the past
2017-03-20 15:55:45 -06:00
Mike Place
be4e66d93f Merge pull request #40132 from ninja-/fix_cron_py3
Fix python2.6 support for cmdmod
2017-03-20 15:42:44 -06:00
Mike Place
0c5c4d2a00 Merge pull request #40153 from cloudflare/fix-40137
Fix #40137 (Problems with netacl.load_filter_config, load_policy_config, etc)
2017-03-20 15:41:48 -06:00
Nicole Thomas
3f48b93045 Merge pull request #40166 from whiteinge/doc-ext-job-cache-job-runners
Add note about the jobs runner to the external job cache docs
2017-03-20 15:31:42 -06:00
Seth House
7ccaf1c9dd Add note about the jobs runner to the external job cache docs 2017-03-20 13:40:14 -06:00
Nicole Thomas
cf92c68078 Merge pull request #40131 from mchugh19/develop
Correction of error logging for zabbix state
2017-03-20 11:19:55 -06:00
Nicole Thomas
3c5fb5b6b6 Merge pull request #40128 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2017-03-20 09:23:37 -06:00
Mircea Ulinic
712240c634 Fix #40137
- add kwargs for all direct CLI calls for the NAPALM function
as the proxy wrapper requires
- adjust filter_options to the newest _make_it_list
2017-03-20 15:03:01 +00:00
Mike Place
47fb078674 Merge pull request #40113 from isbm/isbm-merge-tops
Merge output from master_tops
2017-03-18 10:53:13 -06:00
twangboy
54891277f4 Fix Py2 dectection (uppercase) 2017-03-17 21:47:35 -06:00
ninja
3afc6c0a89 Fix python2.6 support for cmdmod 2017-03-18 02:54:50 +01:00
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
twangboy
52c1f4ef5f Fix pip module for py2 2017-03-17 16:37:02 -06:00
Christian McHugh
48719f5ff0 Correct non-global argument 2017-03-17 21:21:14 +00: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
rallytime
acbb214efe Merge branch '2016.11' into 'develop'
Conflicts:
  - .mention-bot
2017-03-17 14:31:37 -06:00
Yuri Grigorov
3e4a17869e Remove extra second from allowed running window 2017-03-17 22:07:57 +02: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
3bac06f099 Merge pull request #40095 from skizunov/develop2
dns_check should not try to connect when connect=False
2017-03-17 11:31:41 -06:00
Mike Place
31da90edd9 Merge pull request #40096 from skizunov/develop3
When building up the 'master_uri_list', do not try to connect
2017-03-17 11:13:40 -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
Mike Place
5303386d93 Merge pull request #40111 from eldadru/fix-issue-40081-boto-rds-create-overwritten-key-parameter
Fixing simple issue 40081 - the key parameter of the method create ov…
2017-03-17 11:00:02 -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
Mike Place
d2e376e8f2 Merge pull request #40118 from rallytime/cli-example
Add CLI Example for dockerng.get_client_args
2017-03-17 10:34:12 -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
rallytime
bb496bb7f4 Add CLI Example for dockerng.get_client_args 2017-03-17 09:33:05 -06: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
Nicole Thomas
baef5009aa Merge pull request #40097 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-03-17 09:17:08 -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
Yuri Grigorov
619f8dc6ce Remove unused argument 2017-03-17 16:55:17 +02:00
Lukas Raska
a4c565c621 Mark ssh_auth.present state as failure when public key is invalid 2017-03-17 15:22:40 +01:00
Bo Maryniuk
91c7ca10a4 Merge output from master_tops 2017-03-17 15:07:23 +01:00
Eldad Rudich
78b5d112d7 Fixing simple issue 40081 - the key parameter of the method create overwritten by internal loop. 2017-03-17 15:32:59 +02: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