valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
80,844 Commits 24 Branches 182 Tags 341 MiB
5282ea2480
Commit Graph

80844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
jinm
8280e5256e Fix v3 for https://github.com/saltstack/salt/issues/38472 2017-04-06 17:33:09 -06:00
Nicole Thomas
89fe66af90 Merge pull request #40573 from ardakuyumcu/fix-managed-typo 
Fix typo in IAM state for managed policies
 2017-04-06 17:32:05 -06:00
Nicole Thomas
dd4269b328 Merge pull request #40574 from rallytime/lint-develop 
[develop] Lint Fixes
 2017-04-06 16:46:35 -06:00
rallytime
36cddd62d1 [develop] Lint Fixes 2017-04-06 16:45:22 -06:00
Mike Place
fd757fffa3 Merge pull request #40571 from terminalmage/issue39778 
pkgrepo.managed: properly handle comments for debian
 2017-04-06 15:55:45 -06:00
Mike Place
7fdeb9094d Merge pull request #40568 from rallytime/fix-40437 
[salt-cloud] Don't use dict.keys()[x] in PY3 since dicts cannot be indexed
 2017-04-06 15:54:53 -06:00
Mike Place
83f6d3d3bb Merge pull request #40567 from terminalmage/fix-pillar-get-merge-lists 
Allow pillar.get to merge list as well as dictionaries
 2017-04-06 15:54:16 -06:00
Arda Kuyumcu
b56201d870 Fix typo in IAM state for managed policies 2017-04-06 14:53:48 -07:00
Mike Place
b1698e830e Merge pull request #40572 from rallytime/fix-40278 
Clean out kwargs dict in cloud.action before calling cloud driver function
 2017-04-06 15:53:39 -06:00
Mike Place
d349e35fad Merge pull request #40570 from cachedout/pkg_test_flaky 
Add flaky decorator to pkg tests
 2017-04-06 15:52:32 -06:00
Mike Place
62d8ad2b4b Merge pull request #39882 from smarsching/issue-39842 
Fix handling of trailing newlines on Windows
 2017-04-06 15:12:24 -06:00
Nevins Bartolomeo
b3a4d016c9 Mock cmd.run_stdout not cmd.run 2017-04-06 16:48:10 -04:00
rallytime
c978486452 Clean out kwargs dict in cloud.action before calling cloud driver function 
Fixes #40278

When we run a cloud.action function from the CLI, the various __pub_* keys
and values populate the "kwargs" arg. Then, when we attempt to call out
to a cloud driver's function that doesn't accept a "kwarg" arg (or there are
too many args passed now), we get an error.

If the cloud function only takes "name" and "call", we should not be passing
in "kwargs", too.
 2017-04-06 14:29:03 -06:00
Erik Johnson
191610482d pkgrepo.managed: properly handle comments for debian 
Resolves #39778.
 2017-04-06 15:24:38 -05:00
Nicole Thomas
ae13de622a Merge pull request #40451 from isbm/isbm-fileclient-testcase-2016.11 
Fileclient testcase (2016.11)
 2017-04-06 13:53:30 -06:00
Mike Place
a8304cd5a1 Merge pull request #40552 from terminalmage/fix-hash-type-refs 
Don't use __opts__.get() for hash_type
 2017-04-06 12:27:31 -06:00
Mike Place
fa2c8f852a Merge pull request #40557 from isbm/isbm-aws-doc-fix 
Fix the documentation for AWS
 2017-04-06 12:25:54 -06:00
Mike Place
705e1d8a08 Merge pull request #40562 from terminalmage/fix-get-client 
Fix dockerng _get_client() regression
 2017-04-06 12:25:18 -06:00
Mike Place
69058ae67a
Add flaky decorator to pkg tests 2017-04-06 12:22:40 -06:00
Mike Place
77924aeabb Merge pull request #40566 from sjorge/logadm 
Update and refresh logadm module
 2017-04-06 12:19:32 -06:00
Mike Place
74366c57a4 Merge pull request #40564 from techhat/azuredocs 
Update Azure ARM docs
 2017-04-06 12:17:31 -06:00
Nicole Thomas
03f0f4a8b3 Merge pull request #40561 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-04-06 12:15:27 -06:00
Nevins Bartolomeo
9f1321d1a7 only look at stdout when doing pip --version 2017-04-06 14:15:09 -04:00
rallytime
07b2dbeb48 [salt-cloud] Don't use dict.keys()[x] in PY3 since dicts cannot be indexed 
Fixes #40437

Using 'dict.keys()' in Python 3 returns a view iterator instead of a list
like in Python 2. Therefore, we cannot get an indexed item from a dict.

We could wrap that up in a list, but this is slower and somewhat sloppy since
PY3 is trying to help us out and be efficient with dict views. We can get the
key name by using next(iter(dict)), which works both in python 2 and 3. The
order of getting the key names doesn't matter, as long as we get use them all.
 2017-04-06 12:02:50 -06:00
Mike Place
56363bc41c Merge pull request #40462 from cachedout/state_expect_minions 
Fix orch state when no minions return
 2017-04-06 11:58:14 -06:00
Mike Place
74c65557dd Add space before in-lint comment for lint 2017-04-06 11:32:22 -06:00
Mike Place
84fd77797f Merge pull request #40512 from mtkennerly/add-shortcut-file-state 
Add Windows shortcut support to salt.states.file
 2017-04-06 11:30:07 -06:00
Erik Johnson
cb4db56eb5 Allow pillar.get to merge list as well as dictionaries 
This also gets rid of the exception that used to be raised when the
default was not of the proper type, and instead skips merging in those
cases.
 2017-04-06 12:24:22 -05:00
Super-User
77911fcdf3 logadm.rotate now takes all options 2017-04-06 19:11:50 +02:00
Erik Johnson
5f61928988 Merge pull request #40559 from jinm/develop 
Fix v3 for https://github.com/saltstack/salt/issues/38472
 2017-04-06 12:04:00 -05:00
Mike Place
60750a1619
Fix test 2017-04-06 10:48:27 -06:00
Erik Johnson
a7a78da984 remove unused imports 2017-04-06 11:12:07 -05:00
Super-User
29fc259f5e make toggles match variable names in logadm.rotate 2017-04-06 17:59:46 +02:00
Super-User
572b8cc811 logadm _parse_options should handle flags with same value properly 2017-04-06 17:57:23 +02:00