Vitali Quiering
129015b4a4
Add ip protocol to logstash engine
2017-03-24 16:38:27 +01:00
Mircea Ulinic
07a8645611
Add NAPALM section in Nitrogen release notes
2017-03-24 13:22:38 +00:00
Mircea Ulinic
ab8bc6d015
Netconfig added in Nitrogen not 2016.11.1
2017-03-24 13:09:46 +00:00
Mircea Ulinic
423dda9149
Strip include from append_minionid_config_dirs, leave only default_include
2017-03-24 12:30:12 +00:00
qluo1
b4ade181ef
Fix issue-40243: schedule.purge only purge single job
...
return result too early in the purge loop.
https://github.com/saltstack/salt/issues/40243
2017-03-24 22:27:09 +11:00
vnitinv
146f8abc4c
sync with upstream
2017-03-24 12:18:14 +05:30
Nitin Kr
507c553c0e
Merge pull request #21 from rajvidhimar/salt_test
...
Remove usage of nose in junos unit tests
2017-03-24 11:43:32 +05:30
Anthony Shaw
10c84303db
fix unit tests
2017-03-24 15:13:03 +11:00
Tyler Goodlet
8bfa8e0d15
Document qcow support
2017-03-23 23:36:32 -04:00
Anthony Shaw
605a12dbc0
linting
2017-03-24 14:05:19 +11:00
Mircea Ulinic
14923b6fde
Adding proxy module changes under Nitrogen release notes
2017-03-24 01:55:48 +00:00
Mircea Ulinic
a0a2f60961
Note proxy_merge_grains_in_module
2017-03-24 01:55:48 +00:00
Mircea Ulinic
5919d612b2
Adding Nitrogen notes to the proxy topic
2017-03-24 01:55:48 +00:00
Mircea Ulinic
01e9de2d04
Add proxy to index
2017-03-24 01:55:48 +00:00
Mircea Ulinic
18d84dc083
tpyo
2017-03-24 01:55:48 +00:00
Mircea Ulinic
2cfda17165
Add Nitrogen proxy opts to conf
2017-03-24 01:55:48 +00:00
Mircea Ulinic
09670fe9a0
Reference proxy options
2017-03-24 01:55:48 +00:00
Mircea Ulinic
2e42506225
Do not create separate schdule dir for proxies
2017-03-24 01:36:34 +00:00
Mircea Ulinic
247029fc38
Add default_include and include to append_minionid_config_dirs
2017-03-24 01:36:22 +00:00
Matt Phillips
4f18ba3436
typo in states/netconfig.py
2017-03-23 20:00:51 -04:00
rallytime
dbf74330ec
Merge branch '2016.11' into 'develop'
...
Conflicts:
- pkg/windows/req_base.txt
- salt/modules/ssh.py
2017-03-23 16:40:44 -06:00
Mike Place
75cfcf2f46
Merge pull request #40223 from arount/fix/utils/job/keyerror
...
salt.utils.job: Fix bad KeyError handling
2017-03-23 15:11:30 -06:00
Mike Place
3d3a737811
Merge pull request #40229 from bewing/load_config_changes
...
Refactor processing return data from network.load_config
2017-03-23 14:40:54 -06:00
Sergey Kizunov
64d224ad02
rabbitmq: Do not use __context__ for persistent globals
...
The rabbitmq module was using `__context__` to store paths of
rabbitmq executables. `__context__` may be cleared but the module
still could remain in use, in which case it would fail to work
correctly. Move the paths of the rabbitmq executables to their own
global variables so that they are not affected by the lifespan of
`__context__`.
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2017-03-23 14:46:36 -05:00
Mike Place
167045fda1
Merge pull request #40273 from bewing/load_template_cleanup
...
Clean up temporary file in net.load_template
2017-03-23 13:33:32 -06:00
Mike Place
830aac8235
Merge pull request #40271 from cachedout/remove_travis
...
Remove Travis config
2017-03-23 13:32:53 -06:00
Mike Place
e462a04d70
Merge pull request #40200 from DSRCorporation/features/zh864_auth_redesign
...
E-Auth refactoring
2017-03-23 13:32:20 -06:00
Nicole Thomas
1d66961ce7
Merge pull request #40242 from rallytime/merge-develop
...
[develop] Merge forward from 2016.11 to develop
2017-03-23 13:31:39 -06:00
Pedro Algarvio
e092a1a377
Merge pull request #40272 from twangboy/win_tests_decode_names
...
Fix parser for windows... again...
2017-03-23 19:29:33 +00:00
twangboy
72cb96a642
Fix parser for windows... again...
2017-03-23 12:24:26 -06:00
Brandon Ewing
fb1632ac2d
Clean up temporary file in net.load_template
2017-03-23 13:23:15 -05:00
Mike Place
bbf7b55a16
Remove unused import for traceback
2017-03-23 12:11:32 -06:00
Brandon Ewing
b0aebcdab6
Move debug to pchanges and copy all to comment
2017-03-23 13:00:44 -05:00
Mike Place
c6308d2257
Removed Travis config
...
Hasn't been used in years.
2017-03-23 11:50:37 -06:00
Ethan Moore
fa2842c810
re-add .keys() usage in places needed due to dict modifications during for loop
2017-03-23 17:25:44 +00:00
Mike Place
7cde4936d9
Merge pull request #40213 from twangboy/win_tests_decode_names
...
Decode test names in names-file
2017-03-23 10:50:40 -06:00
Mike Place
15b81f7acc
Merge pull request #40228 from mguegan/update_esky_smartos
...
Update esky smartos
2017-03-23 10:47:21 -06:00
Mike Place
b7f9100e6d
Merge pull request #40250 from techhat/settags
...
Add wait_for_fun() to set_tags()
2017-03-23 10:42:12 -06:00
Mike Place
4202a6af7b
Merge pull request #40253 from lomeroe/fix_39976_develop
...
correct method of getting 'text' of the XML object to compare to the …
2017-03-23 10:37:59 -06:00
Mike Place
904e144ae4
Merge pull request #40255 from lomeroe/fix_39976_2016.11
...
backport #40253
2017-03-23 10:36:43 -06:00
Mike Place
9ff44c34d2
Merge pull request #40258 from akissa/fix-support-non-rsa-private-keys
...
Support non RSA headered private keys
2017-03-23 10:35:06 -06:00
Mike Place
db564195fa
Merge pull request #40256 from sergeizv/cloud-roster-fixes-develop
...
Cloud roster and cache runner fixes for develop
2017-03-23 10:31:01 -06:00
rallytime
62b31d7620
Pylint fixes
2017-03-23 10:00:20 -06:00
Nicole Thomas
877183c048
Merge pull request #40254 from rallytime/lint
...
Add ImportError to exception instead of bare "except"
2017-03-23 09:48:17 -06:00
Andrew Colin Kissa
12df93c2ed
Support non RSA headered private keys
...
Fixes issue #40244
2017-03-23 17:24:54 +02:00
Brandon Ewing
710a617db0
Change comment logic and move debug to comment
2017-03-23 10:21:43 -05:00
rallytime
455783a2ef
Add ImportError to exception instead of bare "except"
...
Fixes lint error on develop.
2017-03-23 09:01:51 -06:00
Ethan Moore
0e9f5820cc
backport #40253
2017-03-23 14:50:09 +00:00
Ethan Moore
fa16994c37
correct method of getting 'text' of the XML object to compare to the policy_name
2017-03-23 14:47:45 +00:00
Nicole Thomas
720a362c7a
Merge pull request #40240 from rallytime/merge-2016.11
...
[2016.11] Merge forward from 2016.3 to 2016.11
2017-03-23 08:14:10 -06:00
