valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
81,656 Commits 24 Branches 182 Tags 341 MiB
dcb0d63883
Commit Graph

81656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
dcb0d63883 Update test to reflect additional calls to os.path.isfile() 2017-05-06 01:51:11 -05:00
Erik Johnson
0cbfad2af7 Merge branch 'merge-40775' into develop 2017-05-06 01:48:01 -05:00
Erik Johnson
7ab3454b7a Merge branch 'roster_grains' of https://github.com/edgan/salt into merge-40775 2017-05-06 01:47:44 -05:00
Erik Johnson
772167306c Merge pull request #41015 from gtmanfred/docker 
Allow docker.call to run as non-root user
 2017-05-06 01:21:05 -05:00
Nicole Thomas
272b063963 Merge pull request #41095 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-05-05 13:03:22 -06:00
Mike Place
5dee0b4804 Merge pull request #37952 from lorengordon/jinja-filter-decorator 
Adds an alternate implementation for a jinja filter decorator
 2017-05-05 11:08:20 -06:00
Mike Place
330e717150 Merge pull request #40977 from amendlik/kernelpkg 
kernelpkg module
 2017-05-05 10:21:12 -06:00
Mike Place
3031a01266 Merge pull request #41021 from MTecknology/develop 
New feature: automatic job batching
 2017-05-05 10:20:04 -06:00
rallytime
01a012bbdf Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-05 10:12:18 -06:00
Mike Place
7efa7530f3 Merge pull request #41073 from tshepang/patch-1 
doc: make examples consistent with each other
 2017-05-05 10:06:34 -06:00
Mike Place
127eb04ff6 Merge pull request #41082 from rallytime/fix-spm-unit-tests 
Patch calls to salt.client.Caller and salt.client.get_local_client in spm unit tests
 2017-05-05 10:05:43 -06:00
Nicole Thomas
280d974fe8 Merge pull request #41058 from DSRCorporation/features/non-recursive_fibonacci 
Non-recursive fibonacci implementation.
 2017-05-05 09:56:43 -06:00
Nicole Thomas
bae17ed4b9 Merge pull request #41085 from Ch3LL/fix_azure 
Fix azure tests to query provider
 2017-05-05 09:49:58 -06:00
Nicole Thomas
f4eaa8e44a Merge pull request #41086 from twangboy/fix_test_pkg 
Fix test pkg
 2017-05-05 09:49:16 -06:00
Nicole Thomas
8132d6915f Merge pull request #41087 from ecdavis/boto_lambda-add-qualifier 
boto_lambda.function_present state: allow Qualifier parameter in Permissions
 2017-05-05 09:44:13 -06:00
Nicole Thomas
7541ee100c Merge pull request #41088 from sjorge/zfsdocs 
Fix docs for zfs state module
 2017-05-05 09:42:25 -06:00
Nicole Thomas
2a001529e1 Merge pull request #41066 from toanju/develop 
cloud: update parsing of libcloud version
 2017-05-05 09:41:09 -06:00
Adam Mendlik
2bc930acb3 Fix linter errors 2017-05-05 06:27:37 -06:00
Adam Mendlik
19f7d0c03e Sort package list in APT kernelpkg module 2017-05-05 05:55:47 -06:00
Adam Mendlik
9f13ce9ee2 Fix kernelpkg.latest_available when no upgrades are available 2017-05-05 05:51:11 -06:00
Loren Gordon
bff15d4c61 Updates jinja template tests with salt context 2017-05-05 07:21:40 -04:00
Loren Gordon
ae89f14178 Updates tests to get custom filters from decorator class 2017-05-05 07:21:40 -04:00
Loren Gordon
494022d29e Moves regex_escape and unique filters out of the SerializerExtension class 2017-05-05 07:21:40 -04:00
Loren Gordon
808bb907f2 Applies the decorator to all jinja filters 2017-05-05 07:21:40 -04:00
Loren Gordon
42a608cc39 Adds a decorator for registering jinja filters 
The decorator adds the filter to a class attribute, `salt_jinja_filters`
that maps filter names to functions.
 2017-05-05 07:18:42 -04:00
Super-User
c934f24484 Fix docs for zfs state module 2017-05-05 09:52:20 +02:00
Adam Mendlik
741fd9d1ee Rename kernelpkg.current to kernelpkg.active for clarity 2017-05-04 19:15:04 -06:00
Evan Davis
f7b81dd3f6 allow Qualifier parameter 2017-05-04 16:16:28 -07:00
twangboy
cc3f2d0c31 Fix some indenting issues 2017-05-04 16:51:29 -06:00
twangboy
019dc5f966 Fix some logic in _get_msiexec 2017-05-04 16:49:20 -06:00
twangboy
e4c5156d77 Fix some lint 2017-05-04 16:45:58 -06:00
Nicole Thomas
d4461aa4ad Merge pull request #41079 from brd/doc-slack 
Remove an extra colon that is causing rendering issues
 2017-05-04 15:58:32 -06:00
twangboy
20da5f5d4b Add software def for putty 2017-05-04 15:16:21 -06:00
twangboy
75072b1c83 Fix pkg tests for windows 2017-05-04 15:13:41 -06:00
Ch3LL
1eda73bd61
fix azure tests to query provider 2017-05-04 16:50:24 -04:00
Mike Place
737711f55b Merge pull request #41041 from HuntedCodes/pr-libvirt-ext 
Fixed crash image lacks file ext
 2017-05-04 14:36:16 -06:00
Mike Place
60f9e0cf2a Merge pull request #41067 from deuscapturus/better-failhard 
Allow failhard to work with the salt-api.  Gracefully stop iteration.
 2017-05-04 14:35:37 -06:00
rallytime
891e174f71 Patch calls to salt.client.Caller and salt.client.get_local_client in spm unit tests 
Fixes the spm unit test failures in CentOS 6. These calls to the client need to be
patched so they don't interact with other unit tests.
 2017-05-04 14:30:49 -06:00
Nicole Thomas
21574ea543 Merge pull request #41076 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-04 13:02:59 -06:00
Nicole Thomas
8d2ce58dc2 Merge pull request #41077 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-05-04 13:02:26 -06:00
Tobias Jungel
292d8b682c cloud: update parsing of libcloud version 
since Fedora changed the version to 2.0.0rc2 the version number cannot
be parsed. This fixes the parsing using a regex which should be more
general.
 2017-05-04 20:43:35 +02:00
Brad Davis
4cf0c1bdf8 Remove and extra colon that is causing rendering issues 2017-05-04 12:21:50 -06:00
rallytime
319dc45c1d Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/runners/saltutil.py
 2017-05-04 11:51:32 -06:00
rallytime
c91bb18298 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - doc/ref/configuration/master.rst
  - salt/modules/pip.py
  - salt/states/saltmod.py
 2017-05-04 11:49:33 -06:00
Mike Place
41c2628895 Merge pull request #41068 from rallytime/bp-41023 
Back-port #41023 to nitrogen
 2017-05-04 11:08:57 -06:00
Mike Place
b30b026dda newline for lint 2017-05-04 11:07:57 -06:00
Tshepang Lekhonkhobe
a29045846d doc: make examples consistent with each other 
Also, show a more complex example, which makes removing the templating necessary
 2017-05-04 19:04:20 +02:00
Mike Place
0d10046098 Merge pull request #40967 from ezh/fabric-fix-2-ssh-client 
[40966] Fix ssh client TypeError
 2017-05-04 10:39:57 -06:00
Mike Place
eac8401e90 Merge pull request #40879 from peter-funktionIT/2016.11 
Update win_pki.py
 2017-05-04 10:11:59 -06:00
Mike Place
39f5dc91cb Merge pull request #40909 from gtmanfred/nitrogen 
Define separate target for proxy minions
 2017-05-04 10:07:38 -06:00