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
79,585 Commits 24 Branches 182 Tags 341 MiB
186a6c4f2a
Commit Graph

79585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
60066da614 Merge pull request #39924 from dmurphy18/salt_aix_fixMar 
Add AIX support for user and group execution modules
 2017-03-14 15:04:01 -06:00
Jean Praloran
d7b0c8ae88 We need to match on .p not just strip '.p' otherwise it will remove any p from the string even if we have no dot 2017-03-15 09:49:27 +13:00
Tom Williams
20e80dab65 Merge pull request #1 from rallytime/pr-39977 
Fixup failing unit test for tests.unit.states.test_boto_asg.py file
 2017-03-14 16:29:10 -04:00
rallytime
f6cd372358 Update boto_asg state file unit test mocks to account for changes in #3997 2017-03-14 14:05:20 -06:00
Mike Place
4cfa659eae Merge pull request #40012 from mprenditore/develop 
added certname paramater
 2017-03-14 13:48:49 -06:00
Ch3LL
f3e7e4fb2a Add 2016.3.6 Release Notes 2017-03-14 13:39:48 -06:00
Mike Place
51fb191157 Merge pull request #39841 from rafaelcaricio/telegram-beacon 
Telegram beacon
 2017-03-14 13:30:37 -06:00
rallytime
12bf5bc7f8 Pylint fix 2017-03-14 13:04:51 -06:00
Mike Place
cd73eafec8 Merge pull request #40010 from jettero/s3-bucket-path-broken 
S3 bucket path broken
 2017-03-14 13:01:00 -06:00
Mike Place
14e4392da5 Merge pull request #39886 from Mapel88/develop 
Additional functions for win_iis module & state
 2017-03-14 12:56:18 -06:00
Mike Place
9495664f0f Merge pull request #40002 from s0undt3ch/features/py3 
Minor Py3 test module fix
 2017-03-14 12:44:36 -06:00
Mike Place
87237a83ab Merge pull request #40019 from rallytime/39888-followup 
Fixup some documentation references for new grain.equals function
 2017-03-14 12:38:47 -06:00
Nicole Thomas
26895b7be2 Merge pull request #40016 from terminalmage/fix-grains-test 
Attempt to fix failing grains tests in 2016.3
 2017-03-14 12:34:31 -06:00
Stefano Stella
03d762d77f moved 'certname' to avoid API change 2017-03-14 19:13:19 +01:00
Nicole Thomas
c14c46afde Merge pull request #40014 from bodhi-space/develop 
Extra tiny fix for undefined var in rarely used code path....
 2017-03-14 12:08:34 -06:00
rallytime
dbdc8cba97 Fixup some documentation references for new grain.equals function 
- versionadded
- code-block notation
 2017-03-14 11:38:45 -06:00
Nicole Thomas
dd2bcb7c26 Merge pull request #39888 from ni3mm4nd/module_grains 
Add function for matching key/value grains
 2017-03-14 11:36:40 -06:00
Nicole Thomas
bc49a4a8c5 Merge pull request #39997 from techhat/filterevents 
Add event_filter to salt cloud
 2017-03-14 11:24:23 -06:00
Nicole Thomas
42361596e9 Merge pull request #40009 from gtmanfred/develop 
Use linux_distribution from distro if not in platform
 2017-03-14 11:18:35 -06:00
Nicole Thomas
0c61d064ad Merge pull request #39980 from vutny/cmd-run-state-bg 
[2016.3] Allow to use `bg` kwarg for `cmd.run` state function
 2017-03-14 11:16:13 -06:00
Nicole Thomas
0ec81a4cde Fixup a syntax error 2017-03-14 11:15:02 -06:00
Nicole Thomas
2714676a13 Merge pull request #39746 from terminalmage/pathutils 
Add salt.utils.path
 2017-03-14 11:00:34 -06:00
David Murphy
aabbbffd45 Full support to execution module timezone on AIX 2017-03-14 11:00:14 -06:00
David Murphy
16d5c7ce4a WIP: timezone support for AIX 2017-03-14 11:00:14 -06:00
Pablo Suárez Hernández
9f5c3b7dcd Allows to set custom timeouts for 'manage.up' and 'manage.status' 2017-03-14 16:40:09 +00:00
Pablo Suárez Hernández
2102d9c75c Allows to set 'timeout' and 'gather_job_timeout' via kwargs 2017-03-14 16:39:28 +00:00
Stefano Stella
a53ab72f5e Merge remote-tracking branch 'upstream/develop' into develop 2017-03-14 17:33:02 +01:00
Stefano Stella
d86c94820a added certname even in the acme state 2017-03-14 17:32:34 +01:00
Nicole Thomas
350edbe7e6 Remove unused import in test_core.py 2017-03-14 10:28:42 -06:00
Nicole Thomas
9aca990c97 Merge pull request #40001 from jmickle/develop 
updating documentation typos
 2017-03-14 10:25:41 -06:00
Erik Johnson
5d84b40bfd Attempt to fix failing grains tests in 2016.3 
The tearDown appears to only be removing the grain if it matches a
specific value. This may be leading to the grain value not being blank
at the time the next test is run.

Instead of only deleting the grain if it matches a specific value,
instead delete all items from that grain to ensure that it is empty for
the next test.
 2017-03-14 11:25:15 -05:00
Mapel88
b31d1377ab Update win_iis.py 
added 'r'
 2017-03-14 18:24:52 +02:00
Nicole Thomas
656a26fa3c Merge pull request #39990 from cloudflare/fix-39983 
Cache the napalm object and fetched grains separately
 2017-03-14 10:19:52 -06:00
Jan Kadlec
a797a58ee6 Change function name to equals 2017-03-14 17:15:52 +01:00
Stefano Stella
ce57daaa29 Merge remote-tracking branch 'upstream/develop' into develop 2017-03-14 17:04:24 +01:00
Joseph Hall
367701c136 Lint 2017-03-14 10:04:10 -06:00
Nicole Thomas
61f1fb04c5 Merge pull request #39991 from terminalmage/source_hash-docs 
Document the fact that the checksum type can be omitted in file.managed states
 2017-03-14 09:58:10 -06:00
Tom Williams
6bf38920a7 Extra tiny fix for undefined var in rarely used code path.... 2017-03-14 11:45:34 -04:00
Erik Johnson
c09f8e283c Add httpretty to py34 dev requirements 
httpretty Needs to be here for now even though it's a dependency of
boto. A pip install on a fresh system will decide to target httpretty
0.8.10 to satisfy other requirements, and httpretty 0.8.10 has bugs in
setup.py that prevent it from being successfully installed (at least on
Python 3.4).
 2017-03-14 10:29:19 -05:00
Nicole Thomas
1c46f32dc4 Merge pull request #40006 from mirceaulinic/patch-3 
Adding myself to AUTHORS
 2017-03-14 09:20:50 -06:00
Stefano Stella
665803a941 added certname paramater 2017-03-14 16:20:11 +01:00
Paul Miller
acee5bf7c8 clarify this, because it messes people up in the mailing lists, and myself briefly before I thought about it 2017-03-14 11:12:49 -04:00
Paul Miller
8102ac8e3c same here 2017-03-14 11:10:17 -04:00
Daniel Wallace
b839193443 Use linux_distribution from distro if not in platform 
http://bugs.python.org/issue1322

python 3.7 is deprecating the platform.{linux_distribution,dist}
functions.  They are being moved to the `distro` module on pypi.  This
adds support for using the distro module if platform does not have the
needed functions.
 2017-03-14 10:09:47 -05:00
Paul Miller
21b79e00be In order for the heredoc to be correct, bucket and path have to default to '', not None 2017-03-14 11:09:00 -04:00
Mircea Ulinic
b2668e5bb7 Adding myself to AUTHORS 
Not sure it really matters
 2017-03-14 11:11:39 +00:00
Pedro Algarvio
7e58bde7d0
We need to compare lists under Python3 not dict_keys vs list 2017-03-14 02:17:30 +00:00
Pedro Algarvio
24dbde4ce4
Is this a module, a state, a returner. More information. 2017-03-14 02:17:29 +00:00
Pedro Algarvio
830c793043
We must also override _cmd to properly instantiate our version class 2017-03-14 02:17:29 +00:00
Jonathan Mickle
2d3ae32d11 fixing 9 2017-03-13 17:54:38 -07:00