Nicole Thomas
fdd1f24567
Merge pull request #48309 from terminalmage/fix-yaml-hacks
...
Drop support for Python 2 unicode string literals in YAML renderer
2018-06-30 09:07:55 -04:00
Nicole Thomas
84786a0a6e
Merge pull request #48391 from sjorge/48374
...
Fix dependancy for esky build on SmartOS
2018-06-30 09:05:39 -04:00
Nicole Thomas
fbbafc8de4
Merge pull request #48300 from rallytime/merge-develop
...
[develop] Merge forward from 2018.3 to develop
2018-06-30 08:58:27 -04:00
Jorge Schrauwen
0d31b1388b
Fix dependancy for esky build on SmartOS
2018-06-30 01:11:23 +02:00
Nicole Thomas
712c7d943b
Merge pull request #47780 from moench-tegeder/postgres_options
...
External WAL directory and datapage checksums for PostgreSQL
2018-06-29 15:36:54 -04:00
rallytime
9174ccb4a8
Skip some multiline nodegroup matcher tests
...
These will need to be fixed and address in Fluorine
2018-06-29 15:04:13 -04:00
Erik Johnson
5303b1629c
The Jinja "sort" filter is useless
2018-06-29 13:49:24 -05:00
rallytime
c0b76d009d
Make sure salt.utils.args is imported for NETAPI
2018-06-29 14:47:03 -04:00
rallytime
a50dc60a1f
Skip new batch test in Fluorine until it can be investigated better
2018-06-29 14:46:50 -04:00
Daniel Wallace
304d5898b5
Merge pull request #48379 from KaiSforza/jenkins-clean-workspace
...
Clean up the workspaces at the end for every job
2018-06-29 13:38:11 -05:00
William Giokas
a086e2525a
Clean up the workspaces at the end for every job
2018-06-29 12:07:08 -06:00
Daniel Wallace
7d41e035f5
Merge pull request #48368 from asenci/fix_48367
...
Fix issue #48367 using the same approach as PR #46776
2018-06-29 08:41:23 -05:00
Andre Sencioles
c0a10ec63b
Fix issue #48367 using the same approach as PR #46776
2018-06-29 15:40:24 +12:00
Daniel Wallace
1bccb7a316
Merge pull request #48365 from dubb-b/develop
...
Changing debug to info for logging
2018-06-28 15:50:12 -05:00
Brett Benassi
54660e8e40
Changing debug to info for logging
2018-06-28 14:48:27 -06:00
rallytime
cc94c685c4
Update file unit tests to handle "writelines" change
...
Since file.line is now using "writelines()" instead of "write()", we
need to handle the unittests accordingly.
2018-06-28 15:41:43 -04:00
Nicole Thomas
bd5da83246
Merge pull request #48222 from Martin819/develop
...
Fix GlusterFS module for version 4.0 and above
2018-06-28 14:21:55 -04:00
rallytime
e51a8ee00c
Update file.line to use writelines instead of joining
2018-06-28 12:46:29 -04:00
rallytime
c49546f9e8
Add 'name' as the passed in filepath for test_line_insert_ensure_before_first_line test
...
With 'foo', the test fails with an unknown file KeyError - we need to use the "name"
variable instead.
Fixes the test_line_insert_ensure_before_first_line test.
2018-06-28 12:07:38 -04:00
Martin Polreich
a447012f99
Merge branch 'develop' into develop
2018-06-28 17:19:04 +02:00
Nicole Thomas
98d0a15575
Merge pull request #48313 from mirceaulinic/napalm-junos-gate
...
Add new netmiko and junos functions to the napalm module
2018-06-28 09:22:54 -04:00
Nicole Thomas
187149ba84
Merge pull request #48337 from mirceaulinic/napalm-validate-render
...
Enhance the NAPALM validator function to render (remote) SLS files
2018-06-28 09:09:07 -04:00
Nicole Thomas
e9f4c5893c
Merge pull request #47652 from nullify005/unicoded-wildcard-route53
...
Use the unicode version of the '*' character for route53
2018-06-28 09:07:55 -04:00
Martin Polreich
0b95e46351
Merge branch 'develop' into develop
2018-06-28 14:01:33 +02:00
Martin Polreich
fce887784f
Update glusterfs test case
2018-06-28 13:59:48 +02:00
Mircea Ulinic
634f11e135
Lint
2018-06-28 08:00:11 +00:00
Mircea Ulinic
b44c29d5ac
Netmiko module: enhance the behaviour for a more flexible commit arg
2018-06-28 08:00:06 +00:00
Lee Webb
956cc5ebc4
Merge branch 'develop' into unicoded-wildcard-route53
2018-06-28 09:13:50 +10:00
Daniel Wallace
89ebfbd17c
Merge pull request #48346 from KaiSforza/kitchen-destroy
...
Use the right ssh key to destroy kitchen
2018-06-27 17:10:12 -05:00
William Giokas
22d2d8b908
Use the right ssh key to destroy kitchen
2018-06-27 16:05:14 -06:00
Daniel Wallace
08c2a41ee7
Merge pull request #48330 from KaiSforza/jenkins-warnings
...
Add warnings plugin to replace violations
2018-06-27 13:22:06 -05:00
Nicole Thomas
7716784015
Merge branch 'develop' into unicoded-wildcard-route53
2018-06-27 13:43:17 -04:00
Erik Johnson
2320c8513c
Tweak docs to reflect backported filter
2018-06-27 12:27:47 -05:00
Erik Johnson
267544fd3e
Tweak release notes to reflect new jinja filter being backported
2018-06-27 12:26:35 -05:00
Erik Johnson
5a46e3c86b
Remove unused import
2018-06-27 10:29:32 -05:00
Erik Johnson
b4a0bbf13d
Squelch pylint warning
2018-06-27 10:29:32 -05:00
Erik Johnson
1bb610bdbb
Add unit test for tojson filter
2018-06-27 10:29:32 -05:00
Erik Johnson
6b1b7216bd
Use proper sentences :)
2018-06-27 10:29:32 -05:00
Erik Johnson
d7b6b8c751
Don't run test_yum_base_error when yum can't be imported
2018-06-27 10:29:31 -05:00
Erik Johnson
5bf0e26fad
Use eval instead of yaml loading the pprint output
...
Since the YAML renderer no longer supports this, we can't use it to load
structures with unicode literal strings within them.
2018-06-27 10:29:31 -05:00
Erik Johnson
01ec96fdf5
Account for TypeError raised in CSafeLoader when document is a dict
2018-06-27 10:29:31 -05:00
Erik Johnson
baf49d709d
Add release notes about json_encode_dict/json_encode_list deprecations
2018-06-27 10:29:31 -05:00
Erik Johnson
e2ea136757
Document filter deprecation
2018-06-27 10:29:31 -05:00
Erik Johnson
2487c42c56
Deprecate json_encode_dict and json_encode_list jinja filters
...
These should be replaced with "tojson".
2018-06-27 10:29:31 -05:00
Erik Johnson
cff100403a
Use tojson filter where necessary in jinja filters tests
2018-06-27 10:29:31 -05:00
Erik Johnson
84a40d9445
Dict iteration order isn't always the same. Duh.
2018-06-27 10:29:31 -05:00
Erik Johnson
1ca4f5ca6c
remove unused import
2018-06-27 10:29:31 -05:00
Erik Johnson
458b45b9e6
Minor clarification
2018-06-27 10:29:31 -05:00
Erik Johnson
7f473e6fde
Fix RST link syntax
2018-06-27 10:29:31 -05:00
Erik Johnson
f354254657
Squelch repr flag pylint check
2018-06-27 10:29:30 -05:00
