Nicole Thomas
a6291b17c1
Merge pull request #40496 from rallytime/bp-40415
...
Back-port #40415 to 2016.11
2017-04-04 11:19:38 -06:00
rallytime
8e480fffb5
Merge branch '2016.11' into 'develop'
...
Conflicts:
- salt/runners/saltutil.py
2017-04-04 11:15:41 -06:00
zer0def
9ed85f3c59
Remove directory content instead of directory itself when using force_clone in git.latest state. (refs #31363 )
2017-04-04 19:15:32 +02:00
Pedro Algarvio
104a2fb30c
Keep the same exception raised before the move
2017-04-04 18:04:39 +01:00
Pedro Algarvio
6a638620ba
Move base test case modules to tests.support.case
2017-04-04 18:04:39 +01:00
Pedro Algarvio
9af2ca8823
No need to load all modules docs.
...
This should reduce memory usage as well as speeding up the decorator
2017-04-04 18:04:38 +01:00
Pedro Algarvio
4853952f1f
Use a temporary config
2017-04-04 18:04:38 +01:00
Pedro Algarvio
785698d2ce
Import for the original module
2017-04-04 18:04:38 +01:00
Pedro Algarvio
b94992f544
Some more RUNTIME_CONFIGS and RUNTIME_VARS fixes
2017-04-04 18:04:38 +01:00
Nicole Thomas
3eb8e0baf1
Merge pull request #40468 from techhat/cachealias
...
Add __func_alias__ back in
2017-04-04 11:02:42 -06:00
Pedro Algarvio
e163a747f1
Minor import fixes
2017-04-04 17:29:34 +01:00
Pedro Algarvio
8031ac0209
Move mixins to tests.support.mixins.
...
The adapted config mixin get config methods are not static methods
2017-04-04 17:29:34 +01:00
Mike Place
6056ee302a
Merge pull request #40339 from s0undt3ch/features/py3-pt2
...
[WIP] Move unit tests which were in integration tests - More py3 and mocking fixes
2017-04-04 10:21:46 -06:00
Nicole Thomas
579794dd64
Remove extra blank line for lint
2017-04-04 10:20:31 -06:00
Nicole Thomas
e62603d5eb
Merge pull request #40505 from gtmanfred/2016.3
...
update docs for logging handlers
2017-04-04 10:17:22 -06:00
Mike Place
d254b96498
Merge pull request #40471 from tonybaloney/libcloud_dns_kwargs
...
Update to libcloud_dns module to allow custom kwargs for DNS drivers
2017-04-04 10:12:44 -06:00
Nicole Thomas
31f27beca3
Merge pull request #40521 from ledeuns/patch-2
...
Set True instead of 1
2017-04-04 10:03:24 -06:00
Nicole Thomas
fdf029905c
Merge pull request #40511 from eradman/keyboard_test
...
Add mocks to allow keyboard tests to function on non-Linux systems
2017-04-04 10:02:10 -06:00
herbert.buurman
732681fc13
salt/utils/aws.py: Changed manual dict copying to a .copy()-call
2017-04-04 17:29:20 +02:00
Thomas S Hatch
e21fd54d1b
fix lint on the lint ignores...
2017-04-04 09:27:41 -06:00
herbert.buurman
9209d05536
salt/utils/aws.py: Moved x-amz-content-sha256 to be included in the signed headers
2017-04-04 17:24:12 +02:00
Thomas S Hatch
ce21ebfa9a
use salt exitcodes
2017-04-04 09:10:14 -06:00
herbert.buurman
d9000a53da
salt/utils/aws.py: Updated sig4 to sign _all_ headers (which is not required, but suggested). Changed construction to use join instead of repeated string concatenation.
2017-04-04 17:10:09 +02:00
Thomas S Hatch
8135733a21
fix lint and errors
2017-04-04 09:07:35 -06:00
Erik Johnson
4e3a2d066a
Add a section on the cp module
2017-04-04 10:00:52 -05:00
Calle Pettersson
c5d33ba065
Salt-vault: Fix handling of None-grains
2017-04-04 16:50:35 +02:00
Mike Place
8c0befaa8b
Merge pull request #39109 from bdrung/fix-merge-order-warning
...
Fix top_file_merging_strategy warning if env_order is set
2017-04-04 08:20:55 -06:00
herbert.buurman
dd975cde90
salt/utils/aws.py: Make sure the right headers are selected for signing, and also make sure they are sorted properly.
2017-04-04 16:01:42 +02:00
Denis Fondras
a58e320f41
Set True instead of 1
2017-04-04 14:50:03 +02:00
Mapel88
7b25ed816e
Fixed standardization issues in win_iis
...
- Fixed lint error in set_webapp_settings
- Added SaltInvocationError to data input checks
- Fixed some standardization in set_webapp_settings & get_webapp_settings
2017-04-04 14:10:53 +03:00
Raymond Kuiper
51213790f8
Corrected linting error (whitespace)
2017-04-04 10:56:12 +02:00
Raymond Kuiper
04c94ff6d6
Merge branch 'develop' of github.com:q1x/salt into develop
2017-04-04 09:04:47 +02:00
Erik Johnson
85b9bb4072
Fix label for RST link
2017-04-04 00:28:12 -05:00
Erik Johnson
16e19ea860
Merge branch 'thatch45-rand_m_doc' into 2016.11
2017-04-04 00:27:15 -05:00
Erik Johnson
29769306e8
Fix inaccurate comment
2017-04-03 23:57:08 -05:00
Erik Johnson
6329d3580a
Add initial developer docs on the fileserver and client
...
This may be expanded, but this gives a brief overview.
2017-04-03 23:56:08 -05:00
Eric Radman
3299f5b2ea
Add mocks to allow keyboard tests to function on non-Linux systems
2017-04-03 22:11:38 -04:00
mtkennerly
15e0b1125e
Add Windows shortcut support to salt.states.file
...
Still need to add unit test coverage.
2017-04-03 21:30:11 -04:00
twangboy
75ccca7a2f
Gate deprecation warning
2017-04-03 19:16:54 -06:00
Anthony Shaw
8c74d3df89
Update test_libcloud_dns.py
...
add absolute imports
2017-04-04 10:57:32 +10:00
twangboy
f94161cb7d
Add deprecation warning to win_update state module
2017-04-03 18:29:26 -06:00
twangboy
b3daa03edb
Add deprecation warning to win_update module
2017-04-03 18:05:59 -06:00
Thomas S Hatch
cd7b3449e9
some tidying up
2017-04-03 17:41:29 -06:00
Thomas S Hatch
fe7d76c665
Add winrm framework for salt-ssh
2017-04-03 17:32:48 -06:00
Mike Place
174db75e04
Merge pull request #40487 from Whissi/start-minion-after-master
...
salt-minion.service: Start after salt-master.service
2017-04-03 16:52:23 -06:00
Mike Place
17808e7181
Merge pull request #40480 from terminalmage/docker-auth-handling
...
Improved Docker auth handling and other misc. Docker improvements
2017-04-03 16:44:48 -06:00
Mike Place
30f2593408
Merge pull request #40478 from cloudflare/add-new-funs
...
Add new functions to the net module
2017-04-03 16:31:24 -06:00
Mike Place
f6803bbd6c
Merge pull request #40475 from cloudflare/yang-state
...
New state module: NAPALM YANG
2017-04-03 16:30:54 -06:00
Mike Place
ae43cb69e9
Merge pull request #40458 from cloudflare/napalm-syslog
...
New engine: Napalm syslog
2017-04-03 16:27:10 -06:00
Mike Place
eb7dabb669
Merge pull request #40452 from q1x/develop
...
Added the ability to manage Zabbix usergroup permissions
2017-04-03 16:26:44 -06:00
