Gareth J. Greenaway
6b6dc66c15
Merge branch '2019.2.1' into cp-52787
2019-06-18 19:37:24 -07:00
Gareth J. Greenaway
2e3778b07f
Merge pull request #53434 from weswhet/patch-2
...
Update documentation for newer mac_service module.
2019-06-18 18:15:18 -07:00
Gareth J. Greenaway
89398a9049
Update salt.modules.service.rst
2019-06-18 17:10:42 -07:00
Gareth J. Greenaway
b9c1b1a35e
Update salt.modules.service.rst
...
Fixing merge conflict.
2019-06-18 17:07:02 -07:00
Gareth J. Greenaway
a962a64a5f
Merge branch '2019.2.1' into patch-2
2019-06-18 17:02:36 -07:00
Gareth J. Greenaway
f72ebba980
Merge pull request #53498 from amendlik/links
...
Fix broken documentation links
2019-06-18 16:44:04 -07:00
Megan Wilhite
1bbdc7f6b2
Merge branch '2019.2.1' into cp-52787
2019-06-18 16:53:57 -04:00
Gareth J. Greenaway
0793272181
Merge pull request #53514 from Ch3LL/disable_py3_logging
...
Revert logging changes from #53492
2019-06-18 13:49:03 -07:00
Gareth J. Greenaway
b62be1610e
Merge branch '2019.2.1' into cp-52787
2019-06-18 08:26:43 -07:00
Ch3LL
8c8f0ac0e4
import six runtests log handler
2019-06-18 09:55:44 -04:00
Ch3LL
f442b338b1
Revert "Enable logging for test runs on py3"
...
This reverts commit 9339425dba
2019-06-18 09:51:50 -04:00
Pedro Algarvio
98285f9824
Merge pull request #53485 from s0undt3ch/hotfix/fix-nox-bypass-2019.2.1
...
[2019.2.1] Workaround nox's install only flag
2019-06-18 10:35:33 +01:00
Megan Wilhite
8622bba3c1
Merge branch '2019.2.1' into cp-52787
2019-06-17 18:31:08 -04:00
Akmod
ff7370ef86
Merge pull request #53369 from Akm0d/aix_docs
...
Added refs to AIX module documentation
2019-06-17 14:28:59 -06:00
Megan Wilhite
458fe9f346
Merge branch '2019.2.1' into cp-52787
2019-06-17 11:59:47 -04:00
Akmod
2ece253ae5
Merge branch '2019.2.1' into aix_docs
2019-06-17 09:27:05 -06:00
Pedro Algarvio
69e1d84525
Workaround nox's install only flag
...
To get some information from the system, which we then use to choose the
appropriate static requirements file, we need to run some commands,
something that nox will refuse to do if `--install-only` is passed.
We work around it by manually patching the value of
`session._runner.global_config.install_only` for the commands that we
MUST run, and only those and then we set it back to the value it had
before.
For additional information about why we have to do this, please see:
https://github.com/theacodes/nox/pull/181
2019-06-17 12:22:27 +01:00
Adam Mendlik
e360a70673
Fix broken documentation links for service virtual module
2019-06-15 09:32:23 -06:00
Adam Mendlik
56f65ec2db
Fix broken documentation links for pkg virtual module
2019-06-15 09:32:23 -06:00
Daniel Wozniak
8df7684637
Merge pull request #53461 from waynew/fix-chattr-problems
...
Update file.chattr
2019-06-14 14:16:51 -07:00
Daniel Wozniak
a8d817489f
Merge branch '2019.2.1' into fix-chattr-problems
2019-06-14 14:14:12 -07:00
Daniel Wozniak
cfe866d5ee
Merge pull request #53493 from dwoz/cherry_pick_test_fix
...
Cherry-pick and merge beacon event change
2019-06-14 13:36:09 -07:00
Daniel A. Wozniak
fb104bb102
Cherry-pick and merge beacon event change
2019-06-14 20:15:51 +00:00
Akmod
f2eda45361
Merge branch '2019.2.1' into aix_docs
2019-06-14 13:24:15 -06:00
Daniel Wozniak
a1f4136b9e
Merge pull request #53492 from dwoz/tcp_syndic_fix
...
Fix syndic connection when using tcp transport
2019-06-14 12:23:40 -07:00
Daniel A. Wozniak
17c983b27b
Fix linter
2019-06-14 19:18:38 +00:00
Daniel A. Wozniak
9339425dba
Enable logging for test runs on py3
2019-06-14 19:13:34 +00:00
Daniel A. Wozniak
f1b65d1e26
Fix syndic connection when using tcp transport
2019-06-14 19:13:34 +00:00
Akmod
3e793ac1b2
Merge branch '2019.2.1' into aix_docs
2019-06-12 18:46:51 -06:00
Daniel Wozniak
e852596745
Merge pull request #53437 from twangboy/fix_test_win_file
...
Fix failing symlink test
2019-06-12 15:53:32 -07:00
Daniel Wozniak
a92836b3df
Merge pull request #53408 from s0undt3ch/hotfix/fix-pkg-reqs-2019.2.1
...
[2019.2.1] Fix static requirements
2019-06-12 15:52:32 -07:00
Wayne Werner
62e590beae
Update file.chattr
...
- Better test coverage
- Only return supported attributes from lsattr
- Update how changes are reported
2019-06-12 10:26:52 -05:00
twangboy
8c30dbdb02
Add priv info to error message
2019-06-11 17:48:25 -06:00
twangboy
a7d41a85a7
Make them non-destructive tests
2019-06-11 13:45:41 -06:00
twangboy
d8bede07df
Remove duplicate test
2019-06-11 13:45:41 -06:00
twangboy
89aaf2edbc
Remove duplicate test
2019-06-11 13:45:40 -06:00
twangboy
184ec4a2c2
Skip test on linux
2019-06-11 13:45:40 -06:00
twangboy
c97ea995a8
Mark it a destructive test
2019-06-11 13:45:40 -06:00
twangboy
9da7090907
Fix failing symlink test
2019-06-11 13:45:40 -06:00
Akmod
e800641103
Merge branch '2019.2.1' into aix_docs
2019-06-11 11:47:46 -06:00
Gareth J. Greenaway
ab9fe465fd
Merge pull request #53165 from Ch3LL/ami_window_cloud
...
Update ami's used for windows cloud tests
2019-06-11 08:54:40 -07:00
Pedro Algarvio
19629a0c3c
Fix unit.templates.test_jinja.TestCustomExtensions.test_http_query
2019-06-11 14:30:12 +01:00
Pedro Algarvio
5aee99bd56
Take into account the packaging requirements for OSX
2019-06-11 14:30:12 +01:00
Pedro Algarvio
b9618f6fa6
Take into account the packaging requirements for windows
2019-06-11 14:30:12 +01:00
Pedro Algarvio
ff63ae48f7
Stop compiling static TCP requirements.
2019-06-11 14:30:11 +01:00
Akmod
0ef9892149
Merge branch '2019.2.1' into aix_docs
2019-06-10 17:55:51 -06:00
Wesley Whetstone
010a2c5b25
Update documentation for newer mac_service module.
2019-06-10 16:25:46 -07:00
Daniel Wozniak
d806b58a21
Merge pull request #53431 from saltstack/revert-53332-hotfix/full-test-run-2019.2.1
...
Revert "Non optional full test runs for 2019.2.1"
2019-06-10 14:44:29 -07:00
Akmod
dfb62779c6
Cherry-picked file-stat commit ( #53430 )
2019-06-10 15:32:26 -06:00
Daniel Wozniak
701218ca87
Revert "Non optional full test runs for 2019.2.1"
2019-06-10 14:28:54 -07:00
