Nicole Thomas
04e4bed82c
Merge pull request #40046 from gtmanfred/develop
...
fix some incorrect documents
2017-03-15 11:47:13 -06:00
Nicole Thomas
ad9878fa51
Merge pull request #40026 from rallytime/flaky-decorator
...
Add flaky decorator to flaky rest_tornado test
2017-03-15 09:19:47 -06:00
Daniel Wallace
da6d88a58a
fix some incorrect documents
2017-03-15 10:06:03 -05:00
Nicole Thomas
a84a43db00
Merge pull request #40000 from skizunov/develop2
...
Fix exception in salt-call when master_type is 'disable'
2017-03-15 09:05:18 -06:00
Nicole Thomas
f5d4334178
Merge pull request #39865 from cetanu/patch-2
...
Check if vm_name is splittable before altering
2017-03-14 17:16:01 -06:00
Nicole Thomas
3de5280587
Merge pull request #40024 from rallytime/merge-develop
...
[develop] Merge forward from 2016.11 to develop
2017-03-14 17:00:51 -06:00
Nicole Thomas
dfa304b098
Remove whitespace
2017-03-14 16:33:03 -06:00
rallytime
fe4a208569
Add flaky decorator to flaky rest_tornado test
2017-03-14 16:30:54 -06:00
Nicole Thomas
08d6b96171
Merge pull request #39977 from bodhi-space/infra4506
...
INFRA-4506 - various fixes as detailed below
2017-03-14 15:52:32 -06:00
rallytime
4b0bdc9ce0
Merge branch '2016.11' into 'develop'
...
Conflicts:
- salt/modules/s3.py
2017-03-14 15:39:51 -06:00
Mike Place
8db74fb275
Merge pull request #40020 from dmurphy18/aix_timezone
...
Full support for execution module timezone on AIX
2017-03-14 15:05:30 -06:00
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
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
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
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
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
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
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
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
