Jeffrey 'jf' Lim
f59271f172
tweak prepend_path join code
2017-10-28 00:18:29 +08:00
Nicole Thomas
b2b0c770a4
Merge pull request #44279 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-10-27 12:17:18 -04:00
Jeffrey 'jf' Lim
ba0eaae95e
Fix utils.files.guess_archive_type to recognize the "tbz" extension as well
...
(also tidy up list of extensions)
2017-10-27 12:15:41 -04:00
Ollie Armstrong
ae34a15503
docker_container.running sort list of links
...
When the docker_container.running module is comparing the defined state
and the current state of a container, the list of linked containers in
the current state is is a non-deterministic order. This results in a
container recreation even though the links are the same (just in a
different order).
This patches the comparison function to lexically sort both the existing
and desired list of links, making the comparison deterministic and not
recreating a container when the links have not changed.
Fixes #44258 .
2017-10-27 12:14:16 -04:00
Jeffrey 'jf' Lim
6bd8aea8cf
cmdmod: shift new prepend_path argument to the end to avoid breaking any positional argument calls
2017-10-28 00:02:17 +08:00
Jeffrey 'jf' Lim
bbdcaee250
tag prepend_path option with '.. versionadded:: Oxygen'
2017-10-27 23:37:06 +08:00
Erik Johnson
340a07b62f
Merge pull request #44262 from oarmstrong/develop
...
docker_container.running sort list of links
2017-10-27 10:20:23 -05:00
Erik Johnson
bd5b9dd0aa
Merge pull request #44291 from Ch3LL/pillar_test
...
add saltutil.refresh_pillar test
2017-10-27 10:19:42 -05:00
Erik Johnson
50dfc74ea2
Merge pull request #44287 from jf/fix_tbz.ext_archive_type_recognition
...
Fix utils.files.guess_archive_type to recognize the "tbz" extension as well
2017-10-27 10:17:52 -05:00
Erik Johnson
17d8e46abf
Merge pull request #44277 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-10-27 10:16:00 -05:00
Nicole Thomas
cf77a6bf0f
Merge pull request #43754 from spenceation/panos-2017-9-26
...
Update to PANOS modules.
2017-10-27 10:36:02 -04:00
Nicole Thomas
bb65040bf1
Merge pull request #44234 from xavierog/fix-grafana4-dashboard-2017.7
...
grafana4: dashboard: do not override the title.
2017-10-27 10:32:16 -04:00
Nicole Thomas
bebc33daf5
Merge pull request #44295 from HeinleinSupport/issue44272
...
fixes issue #44272
2017-10-27 10:28:57 -04:00
Nicole Thomas
ba17a1c4d0
Merge pull request #44267 from twangboy/win_fix_lgpo
...
Fix type and Py3 issues in LGPO module
2017-10-27 10:27:50 -04:00
rallytime
09d0a347c5
Reduce the number of days an issue is stale by 15
2017-10-27 09:48:08 -04:00
Xavier G
e1853e5b5b
Merge branch 'develop' into fix-grafana4-dashboard-2017.7
2017-10-27 09:43:16 +02:00
Jeff Schroeder
1576c9980c
Fix test_kubernetes.py after fixing bug in 25f7c4996730a578b7875e924508a5c1774e8b7c
2017-10-26 18:20:49 -05:00
Jeff Schroeder
9304a428e3
Add the change-cause annotation to kubernetes created objects
...
This allows commands such as `kubectl rollout history deploy/$FOO` to
automatically show the deployment changed as a result of the salt run
and follows exactly how kubectl works when passed the `--record` flag.
2017-10-26 18:20:41 -05:00
Jeff Schroeder
9ceabf29f4
Fix kubernetes.node_labels()
...
This prevented showing, adding, or removing any labels from nodes
2017-10-26 18:20:34 -05:00
Jeff Schroeder
ac20ddfa25
Fix a bug in the kubernetes module for ssl cert paths
...
When the `client_key_file` attribute was defined and the `client_key`
attribute was not, the conditional for `client_key` would wrongly zero
`kubernetes.client.configuration.key_file`.
This was a bit annoying to figure out, but the kubernetes module now can
authenticate with minikube with a configuration such as this (where jeff
is $USER):
kubernetes.api_url: 'https://192.168.99.100:8443 '
kubernetes.certificate-authority-file: '/home/jeff/.minikube/ca.crt'
kubernetes.client-certificate-file: '/home/jeff/.minikube/client.crt'
kubernetes.client-key-file: '/home/jeff/.minikube/client.key'
The various options can be gotten from ~/.kube/config after running `minikube start`.
2017-10-26 18:20:28 -05:00
Nicole Thomas
e16707c403
Merge pull request #44285 from Ch3LL/all_spm
...
add spm integration tests for remove and build
2017-10-26 17:20:09 -04:00
Nicole Thomas
6392896a22
Merge pull request #44301 from twangboy/win_fix_test_pydsl
...
Fix test_pydsl on Windows
2017-10-26 17:14:21 -04:00
Ch3LL
ff92f31cbe
remove skipif for docker
2017-10-26 14:43:31 -04:00
twangboy
6db23757bc
Fix test_pydsl on Windows
...
Fix salt.utils.fopen to handle the 't' mode correctly in Windows
Fix the test_pysl test issues with spacing and file paths
2017-10-26 10:18:07 -06:00
Ch3LL
c13f37eee4
change service name depending on os
2017-10-26 11:44:38 -04:00
Jeffrey 'jf' Lim
b3b6c6fc3a
Fix pydoc indentation for cmdmod.run_chroot, clean_env option
2017-10-26 23:23:09 +08:00
Jeffrey 'jf' Lim
412506e626
Add prepend_path option to cmd.run (meant as a response to #21840 )
2017-10-26 23:22:05 +08:00
Ch3LL
1f77f3e6a3
add skipif logic for fallocate cmd
2017-10-26 10:09:33 -04:00
Nicole Thomas
8787d02688
Merge pull request #44293 from UtahDave/fix_unittest_docs
...
Fix documentation grammar and spelling errors
2017-10-26 09:05:30 -04:00
Nicole Thomas
bf54e49202
Merge pull request #43861 from eyj/sentry_mod
...
Use dsn if specified as all recent raven libraries can init via dsn
2017-10-26 09:03:17 -04:00
Robert Sander
f972715a45
fixes issue #44272
...
The method stop() in the state module win_service fails if the service has already been stopped.
2017-10-26 10:52:19 +02:00
Nasenbaer
35c6a02689
Add sentry config deprecation to release notes
2017-10-26 10:29:43 +02:00
Nasenbaer
f5ad6aeb70
Debug log added when throttled by API
2017-10-26 10:15:00 +02:00
Nasenbaer
c05d9aeced
Encode tags as utf-8, retry policy readout
2017-10-26 10:15:00 +02:00
David Boucha
c919648ab4
Fix documentation grammar and spelling errors
2017-10-25 17:24:26 -06:00
Ch3LL
34e2955445
add saltutil.refresh_pillar test
2017-10-25 15:56:49 -04:00
nasenbaer13
aae09b1875
Merge branch 'develop' into sentry_mod
2017-10-25 21:47:04 +02:00
Mike Place
6e33743c1a
Merge pull request #44248 from Ch3LL/spm_create_repo
...
SPM tests: use _spm_build_files method during test_build setup
2017-10-25 21:45:02 +02:00
Mike Place
19e27436f2
Merge pull request #44278 from fedepires/softlayer-dedicated-host
...
Support softlayer dedicated host in salt-cloud.
2017-10-25 21:42:01 +02:00
Mike Place
e7ca9f8407
Merge pull request #44286 from gtmanfred/2016.11
...
use our git repo for kitchen-salt
2017-10-25 21:27:32 +02:00
rallytime
8237f45a46
Add print_function to __future__ import list
2017-10-25 14:54:03 -04:00
Jeffrey 'jf' Lim
5e2cab0d5e
Fix utils.files.guess_archive_type to recognize the "tbz" extension as well
...
(also tidy up list of extensions)
2017-10-26 02:08:16 +08:00
Ch3LL
980c43ebc9
change skip message check to docker
2017-10-25 13:43:13 -04:00
Ch3LL
3955537609
change skip if check to docker
2017-10-25 13:40:58 -04:00
Ch3LL
aa8875a0e2
change service name to docker
2017-10-25 13:39:46 -04:00
Daniel Wallace
193e715e37
use our git repo for kitchen-salt
2017-10-25 11:15:17 -06:00
Ch3LL
03b5c4bc6d
add spm integration tests for remove and build
2017-10-25 12:09:51 -04:00
Ch3LL
0a387c2ecd
fix pylint
2017-10-25 12:08:29 -04:00
Ch3LL
f383f05a93
Add SPM create_repo integration test
2017-10-25 12:06:08 -04:00
rallytime
055b0701de
Lint fix from sloppy merge conflict resolution
2017-10-25 11:58:44 -04:00
