Commit Graph

93498 Commits

Author SHA1 Message Date
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
esell
b2725f9858
add allocate_public_ip to docs 2018-04-30 09:29:51 -06: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
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
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
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
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
8a1202c308
Merge pull request #47263 from terminalmage/aptpkg-virtualectomy
aptpkg: Drop virtual package support for Fluorine
2018-04-27 09:22:38 -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
Brandon Kurtz
12ac26086e
fixing typo 2018-04-26 13:12:13 -04:00
Nicole Thomas
587c4389ec
Merge pull request #47230 from leeclemens/add-selinux-port
Add functionality and tests for managing selinux port policy
2018-04-26 11:22:30 -04:00
Nicole Thomas
8e376c80c9
Merge pull request #47309 from rallytime/merge-develop
[develop] Merge forward from 2018.3 to develop
2018-04-26 11:15:50 -04:00
Nicole Thomas
618b6985ca
Merge pull request #46175 from garethgreenaway/35777_properly_deprecate_template_context_data_in_fluorine
[develop] Properly deprecate template context data
2018-04-26 11:00:57 -04:00
Nicole Thomas
776cdde46f
Merge pull request #47298 from rrroo/ec2-describeinstance-exp-backoff
ec2: Use exponential backoff for describeinstance
2018-04-26 10:07:52 -04:00
Thomas Güttler
549a3394bf
docs for cron.py: ... use identifier. 2018-04-26 10:30:29 +02:00
rrroo
36e0484ebe Use exponential backoff for describeinstance 2018-04-26 08:47:00 +02:00
Gareth J. Greenaway
61c29bc9f8
Removing shutdown_timeout=1 from the calls to absent in the docker_container tests. 2018-04-25 19:51:50 -07:00
Gareth J. Greenaway
1be50abd4d
Removing deprecation warnings from salt/utils/args.py.
Ensuring all previously failing tests are working.

Adding full_return and print_event to INTERNAL_KEYWORDS.
2018-04-25 19:51:50 -07:00
Nicole Thomas
e8d837357a
Merge pull request #47305 from garethgreenaway/fixing_unit_engines_test_libvirt_events
[develop] Fixing unit.engines.test_libvirt_events.test_create_register
2018-04-25 17:12:52 -04:00
rallytime
fda3e717d7
Update old warn_until utils path to new versions path 2018-04-25 14:54:37 -04:00
rallytime
9aeb5e78f2
Merge branch '2018.3' into 'develop'
Conflicts:
  - salt/modules/zfs.py
  - salt/modules/zpool.py
  - salt/states/zfs.py
  - salt/states/zpool.py
  - salt/utils/vault.py
  - salt/utils/zfs.py
  - tests/unit/utils/test_zfs.py
2018-04-25 14:50:36 -04:00
Nicole Thomas
fff4f8c1a5
Merge pull request #47280 from gtmanfred/localectl
make sure not to send invalid information
2018-04-25 13:46:44 -04:00
Gareth J. Greenaway
7740e413da
Fixing unit.engines.test_libvirt_events.test_event_register to ensure the return value is correct and the engine does not loop forever. 2018-04-25 10:32:40 -07:00
Daniel Wallace
24604da0ea
Merge pull request #47211 from edlane/ec2-rate-limit-fix
Fix for AWS EC2 Rate Limit Failures in salt-cloud
2018-04-25 11:13:15 -05:00
Nicole Thomas
205701dcbe
Merge pull request #47038 from garethgreenaway/46977_fixing_fileclient_forward_compatibilty
[2018.3] fix to fileclient.py
2018-04-25 10:57:03 -04:00
Nicole Thomas
89daf4fdc7
Merge pull request #47060 from OrlandoArcapix/Issue47059-return_dict_from_state
Return an empty dict for 'changes' instead of 'None'
2018-04-25 10:55:23 -04:00
Nicole Thomas
10cc0d312b
Merge pull request #47153 from terminalmage/issue47089
salt.modules.ssh: properly encode/decode I/O
2018-04-25 10:53:51 -04:00
Nicole Thomas
0c0fa0cb8a
Merge branch 'develop' into add-selinux-port 2018-04-25 10:26:29 -04:00
Daniel Wallace
7c212cbb2d
fix pylint 2018-04-25 08:59:25 -05:00
Nicole Thomas
29e683bea6
Merge pull request #47243 from cbosdo/libvirt_engine_autoconnect
virt connection improvements
2018-04-25 09:59:24 -04:00
Nicole Thomas
b5d64f1a70
Merge pull request #47275 from terminalmage/issue47199
Fix false failure events sent when using syndic
2018-04-25 09:56:46 -04:00
Nicole Thomas
6215a995d8
Merge pull request #47284 from skjaro/beacon_diskusage_doc_fix
Fix beacon diskusage documentation for the new beahavior mentioned in issue #47267
2018-04-25 09:52:29 -04:00
Nicole Thomas
90867bb795
Merge pull request #47287 from esell/ssh_password-fix
convert unicode ssh pass to str for azure
2018-04-25 09:48:12 -04:00
Nicole Thomas
3ef4fe6ed2
Merge pull request #47291 from bosatsu/fix-proxy-minion-beacon-doc
Fix proxy minion beacon doc
2018-04-25 09:42:35 -04:00
Nicole Thomas
ea2d68b865
Merge pull request #47255 from garethgreenaway/47239_fixes_to_salt_proxy_beacon
[2018.3] Fixes to salt_proxy beacon and beacon tests
2018-04-25 09:41:50 -04:00
Pablo Suárez Hernández
3221eec724
Fix logging during network interface querying 2018-04-25 09:11:41 +01:00