Commit Graph

81083 Commits

Author SHA1 Message Date
rallytime
4957f7753e Fixup fileclient_test file to conform to new standards 2017-04-10 10:30:33 -06:00
Peter N
df9b061a33 Fix confusing typo in thorium start page
The thorium auto deregistration example has a slightly confusing typo.  From my read of the docs it should `s/startreg/statreg` so I'm submitting this PR to make that effective.
2017-04-10 10:54:26 -04:00
Artur Kaszuba
3a0d61f108 Use correct exec_driver in dockerng.sls module
This change allow to execute dockerng.sls module with correct
docker exec_driver.
2017-04-10 15:55:48 +02:00
Denys Havrysh
dae34b30f9 Add OpenRC init scripts for bootstrapping Alpine Linux from Git 2017-04-10 11:52:56 +03:00
Mathieu Le Marec - Pasquet
80d9482248 Fix #40602: onfail_stop: test loop order is broken 2017-04-10 10:22:03 +02:00
Super-User
1c0aafdbfa Always delete and re-add configuration to logadm
There where weird issues with some flags going missing every now and
then. This is less ideal but so far no of the config has gone missing in
my tests.
2017-04-09 16:29:06 +02:00
Super-User
511fed46e6 rename logadm.config_absent to logadm.remove, implement logadm.rotate 2017-04-09 16:14:17 +02:00
Super-User
3ec4d487b1 logadm's _parse_options should parse numbers as ints 2017-04-09 16:13:36 +02:00
Super-User
cf2898fbdb generate docs for salt.states.logadm 2017-04-09 15:44:18 +02:00
Super-User
431bf76a97 logadm.config_absent state 2017-04-09 10:47:24 +02:00
Super-User
f5cb6ab240 Fix a strange issue of logs not being added
Added an except from the logadm manpage because it took me a good chunk
of the day to figure this one out!
2017-04-09 10:43:52 +02:00
Christian McHugh
fc6cf53545 Ensure batch uses passed eauth token or credentials 2017-04-09 09:23:06 +01:00
Super-User
3299948de3 logadm's _parse_options should be better at figuring out the log_file 2017-04-09 10:05:28 +02:00
Tom Williams
0d61f25cc4 INFRA-4376 - fix one last pylint kvetch, and add a bit more exception catching 2017-04-07 22:20:47 -04:00
Tom Williams
5c4e704f97 INFRA-4376 - If pylint not happy, ain't NOBODY happy! 2017-04-07 18:26:08 -04:00
Tom Williams
805b3b4050 INFRA-4376 - Several boto_rds fixes and improvements 2017-04-07 18:26:08 -04:00
rallytime
8fb3810fa2 Resolve merge conflicts in salt.modules.dockermod.py 2017-04-07 15:14:04 -06:00
Mike Place
7dd4a52ca1 Merge pull request #40587 from rallytime/merge-develop
[develop] Merge forward from nitrogen to develop
2017-04-07 13:31:51 -06:00
Mike Place
4fa58be222 Merge pull request #40588 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-04-07 13:30:13 -06:00
Mike Place
72f83706bf Merge pull request #40569 from nevins-b/minor_pip_fix
only look at stdout when doing pip --version
2017-04-07 12:53:18 -06:00
Mike Place
109139efb2 Merge pull request #40579 from vquiering/zabbix_returner_do_not_split_minion_id
in zabbix returner do not split the minion_id
2017-04-07 12:52:47 -06:00
Mike Place
90c083d2b7 Merge pull request #40583 from whiteinge/keys-headers
Add missing header docs to /keys URL
2017-04-07 12:52:05 -06:00
rallytime
5a419b8aae Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/modules/pillar.py
2017-04-07 11:23:41 -06:00
rallytime
4a75675d07 Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - doc/topics/cloud/azurearm.rst
  - salt/modules/aptpkg.py
  - salt/modules/dockermod.py
  - tests/unit/modules/dockerng_test.py
2017-04-07 11:20:51 -06:00
rallytime
2670836bc0 Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-04-07 10:57:57 -06:00
Seth House
2bc14958a8 Add missing header docs to /keys URL 2017-04-07 10:40:39 -06:00
Erik Johnson
7103707d49 Remove unnecessary versionadded lines
There's already one at the top of the function's docstring.
2017-04-07 10:42:39 -05:00
Nicole Thomas
3d07f637ca Merge pull request #40575 from rallytime/bp-40559
Back-port #40559 to 2016.11
2017-04-07 09:42:25 -06:00
Nicole Thomas
9041ca2ba5 Merge pull request #40576 from rallytime/bp-40573
Back-port #40573 to 2016.11
2017-04-07 09:20:10 -06:00
Pablo Suárez Hernández
cf874d80ef Adding missing kwargs parameters to pkg.install call 2017-04-07 16:10:19 +01:00
Pablo Suárez Hernández
f23f94d9ba Enables pkg.downloaded to verify packages after package manager call. 2017-04-07 16:10:18 +01:00
Pablo Suárez Hernández
9fd358ffd4 Pylint fixes 2017-04-07 16:10:17 +01:00
Pablo Suárez Hernández
6d178abfaa Fixes parse_targets when advisory id is passed as name 2017-04-07 16:09:55 +01:00
Pablo Suárez Hernández
2b5e6a0e95 Fixes _find_download_targets to call _preflight_check 2017-04-07 16:09:55 +01:00
Pablo Suárez Hernández
58b378acdd Moving advisory ids checks into pkg_resource.parse_targets 2017-04-07 16:09:55 +01:00
Pablo Suárez Hernández
5c520021e6 Improving function naming 2017-04-07 16:09:55 +01:00
Pablo Suárez Hernández
0dcd7a3ea5 Adds support for listing advisory patches with Yum 2017-04-07 16:09:53 +01:00
Pablo Suárez Hernández
40214081e2 Adds support for listing advisory patches with Zypper 2017-04-07 16:09:23 +01:00
Erik Johnson
f8bc423ef9 Merge pull request #40563 from terminalmage/merge-2016.3-2016.11
Merge-forward 2016.3 -> 2016.11
2017-04-07 10:08:19 -05:00
Erik Johnson
0c608d7417 Add client_args_mock back to test
I removed this incorrectly in resolving a merge conflict.
2017-04-07 08:50:45 -05:00
Pablo Suárez Hernández
8ddf491570 Check targets for advisory patches installation 2017-04-07 10:29:32 +01:00
Pablo Suárez Hernández
79148a241d Adding pkg.patched and pkg.patch_downloaded states 2017-04-07 10:29:32 +01:00
Pablo Suárez Hernández
d33d48c672 Adding documentation for pkg.downloaded state 2017-04-07 10:29:32 +01:00
Pablo Suárez Hernández
2235af27a8 Adding new pkg.downloaded state 2017-04-07 10:29:32 +01:00
Pablo Suárez Hernández
fe0c02423f Adding list_downloaded function to Yum module 2017-04-07 10:29:31 +01:00
Pablo Suárez Hernández
5e598a9d0a Adding list_downloaded function to Zypper module 2017-04-07 10:29:31 +01:00
Pablo Suárez Hernández
2612efc688 Adding support for installing patches in Zypper module 2017-04-07 10:29:31 +01:00
Pablo Suárez Hernández
ec78ceeb58 Adding support for installing patches in yum/dnf execution module 2017-04-07 10:29:31 +01:00
Vitali Quiering
2042d8202f do not split the minion_id to get the host 2017-04-07 08:48:51 +02:00
Arda Kuyumcu
12180808ee Fix typo in IAM state for managed policies 2017-04-06 17:34:23 -06:00