rallytime
|
5a071c5ddf
|
Merge branch '2018.3' into 'develop'
Conflicts:
- salt/cloud/clouds/azurearm.py
|
2018-04-30 16:33:13 -04:00 |
|
Nicole Thomas
|
31178e7bae
|
Merge pull request #46181 from OrlandoArcapix/patch-1
Update influx_retention_policy state
|
2018-04-30 15:02:46 -04:00 |
|
Nicole Thomas
|
67ea439b0e
|
Merge pull request #47278 from lomeroe/add_static_rebase
Multiple lgpo fixes
|
2018-04-30 14:57:23 -04:00 |
|
Nicole Thomas
|
7f461b3387
|
Merge pull request #47402 from esell/public_ip
Add allocate_public_ip to Azure Docs
|
2018-04-30 14:55:20 -04:00 |
|
Nicole Thomas
|
c267e6083e
|
Merge pull request #47367 from terminalmage/issue47325
Start docker containers with image name instead of ID
|
2018-04-30 14:46:12 -04:00 |
|
Nicole Thomas
|
3bb00cbb55
|
Merge pull request #47401 from gtmanfred/proxy
fix proxy virtual checks for marathon and fx2
|
2018-04-30 14:44:45 -04:00 |
|
esell
|
b2725f9858
|
add allocate_public_ip to docs
|
2018-04-30 09:29:51 -06:00 |
|
Daniel Wallace
|
99f9231759
|
fix proxy virtual checks for marathon and fx2
|
2018-04-30 10:05:57 -05:00 |
|
Mike Place
|
c160fe36ce
|
Merge pull request #47397 from rallytime/2018.3.1-release-notes
Add 2018.3.1 Release Notes
|
2018-04-30 09:44:38 -05:00 |
|
rallytime
|
3b40cdad2a
|
Add 2018.3.1 Release Notes
|
2018-04-30 09:35:46 -04:00 |
|
Nicole Thomas
|
ebe7fd41de
|
Merge pull request #46184 from The-Loeki/dns-impr
DNS utils improvements
|
2018-04-30 09:01:47 -04:00 |
|
Nicole Thomas
|
592db608a6
|
Merge pull request #46391 from homolkad/restartcheck-reworked
Reworked modules.restartcheck: optimize code, generator, timeout
|
2018-04-30 08:57:45 -04:00 |
|
Daniel Wallace
|
3400f829c4
|
Merge pull request #47374 from DSRCorporation/bugs/tornado50-2018.3
tornado50 merge forward for 2018.3
|
2018-04-29 11:29:11 -05:00 |
|
Daniel Wallace
|
400999c54f
|
fix pylint
|
2018-04-28 12:12:06 -05:00 |
|
Daniel Wallace
|
47b6d409d1
|
add io_loop handling to runtests engine
|
2018-04-28 11:16:26 -05:00 |
|
Daniel Wozniak
|
2afe4bee95
|
Merge pull request #47379 from dwoz/m2crypto_regression
Properly encode messages when creating/validating signatures with m2crypto
|
2018-04-28 01:38:22 -07:00 |
|
Daniel Wallace
|
fd074fdb7d
|
use salt.utils.zeromq
|
2018-04-27 19:41:00 -05:00 |
|
Daniel A. Wozniak
|
068f2d430d
|
Always sign and verify bytes
|
2018-04-27 16:20:18 -07:00 |
|
Daniel A. Wozniak
|
7810ebaba9
|
Add sign regression tests
|
2018-04-27 16:14:29 -07:00 |
|
Daniel A. Wozniak
|
f4441c3a1c
|
Adding regression test for 47124
|
2018-04-27 16:03:03 -07:00 |
|
Nicole Thomas
|
13546fbc8c
|
Merge branch 'develop' into restartcheck-reworked
|
2018-04-27 17:13:33 -04:00 |
|
Nicole Thomas
|
146121a3e8
|
Merge branch 'develop' into dns-impr
|
2018-04-27 17:00:32 -04:00 |
|
Gareth J. Greenaway
|
b8a08e9c14
|
Merge branch 'develop' into patch-1
|
2018-04-27 13:51:53 -07:00 |
|
Nicole Thomas
|
8f3f3146ba
|
Merge pull request #47169 from clinta/grain_crash
catch invalid data in hw_data
|
2018-04-27 16:47:53 -04:00 |
|
Nicole Thomas
|
d3c49a95b7
|
Merge pull request #47356 from robinro/fix-sysctl
Fix sysctl translate
|
2018-04-27 16:46:33 -04:00 |
|
Nicole Thomas
|
02b8a6465b
|
Merge pull request #47248 from gtmanfred/develop
forward merge #46520 to develop
|
2018-04-27 16:44:54 -04:00 |
|
Pedro Algarvio
|
4ae33c5d9a
|
Run off of a temporary config
|
2018-04-27 23:41:38 +03:00 |
|
Pedro Algarvio
|
7938b4906e
|
Allow running pytest>=3.5.0
|
2018-04-27 23:38:08 +03:00 |
|
Dmitry Kuzmenko
|
34058c181e
|
Tornado 5.0 compatibility fixes
|
2018-04-27 23:38:06 +03:00 |
|
Erik Johnson
|
798134caa3
|
Add regression test for creating images with image name insead of ID
Also changed an existing test to use the new with_tempdir decorator
|
2018-04-27 12:32:10 -05:00 |
|
Erik Johnson
|
4ed47e839c
|
Start docker containers with image name instead of ID
|
2018-04-27 11:52:26 -05:00 |
|
Clint Armstrong
|
d60becd697
|
use saltutil.stringutils to handle unicode errors
|
2018-04-27 12:03:15 -04:00 |
|
Clint Armstrong
|
52fe2cac02
|
catch invalid data in hw_data
|
2018-04-27 12:03:15 -04:00 |
|
Mike Place
|
1de101b8ab
|
Merge pull request #47294 from meaksh/develop-bsc1087581
Fix error logging during network interface querying (fqdn)
|
2018-04-27 10:09:14 -05:00 |
|
Mike Place
|
53a344b1c4
|
Merge branch 'develop' into add_static_rebase
|
2018-04-27 10:04:34 -05:00 |
|
Mike Place
|
7390b72808
|
Merge pull request #47277 from morganwillcock/netbsdswap
Fix minion crash on NetBSD
|
2018-04-27 10:02:20 -05:00 |
|
Mike Place
|
2b7c7ef704
|
Merge pull request #47320 from twangboy/win_ssm
Change from NSSM to SSM
|
2018-04-27 09:37:49 -05:00 |
|
Mike Place
|
de35d6f41d
|
Merge pull request #47323 from guettli/patch-2
docs for cron.py: ... use `identifier`.
|
2018-04-27 09:08:38 -05:00 |
|
Nicole Thomas
|
b6df5facce
|
Merge pull request #47308 from rallytime/bp-47287
Back-port #47287 to 2018.3
|
2018-04-27 09:50:49 -04:00 |
|
Nicole Thomas
|
8a1202c308
|
Merge pull request #47263 from terminalmage/aptpkg-virtualectomy
aptpkg: Drop virtual package support for Fluorine
|
2018-04-27 09:22:38 -04:00 |
|
Nicole Thomas
|
efa3aab800
|
Merge pull request #47332 from garethgreenaway/47324_archive_extracted_keep_keep_source
[2018.3] Removing duplicate code from state/archive.py
|
2018-04-27 09:12:50 -04:00 |
|
Robin Roth
|
26316e07ec
|
Fix sysctl translate
|
2018-04-27 12:39:33 +02:00 |
|
Erik Johnson
|
b908191c3b
|
Additional cleanup from removing virtual package support
This removes a no-longer-used function, as well as some
no-longer-applicable documentation.
|
2018-04-26 23:21:36 -05:00 |
|
Erik Johnson
|
dd4b0de0e0
|
Add release notes for dropping of virtual package support
|
2018-04-26 23:21:36 -05:00 |
|
Erik Johnson
|
977a930c3e
|
Add unit test for aptpkg.show
|
2018-04-26 23:21:36 -05:00 |
|
Erik Johnson
|
a6efffe408
|
aptpkg: Add pkg.show function
|
2018-04-26 23:21:36 -05:00 |
|
Erik Johnson
|
df9a737beb
|
aptpkg: Remove "virtual package" support
|
2018-04-26 23:21:32 -05:00 |
|
Nicole Thomas
|
63b5391a55
|
Merge pull request #47333 from discentem/patch-1
fixing typo
|
2018-04-26 13:39:46 -04:00 |
|
Nicole Thomas
|
245d62ca16
|
Merge pull request #47326 from The-Loeki/redis-cache-sockets
Some Redis fixes
|
2018-04-26 13:12:46 -04:00 |
|
Brandon Kurtz
|
12ac26086e
|
fixing typo
|
2018-04-26 13:12:13 -04:00 |
|