Roche, Damien
32c1fb74fa
Purged trailing whitespace
2017-02-09 16:17:24 +00:00
Nicole Thomas
63c7c79455
Fix the new jinja_test failures ( #39262 )
...
Refs #37808
The max fuction returns an int, not a float, as does the min function.
This updates the assertions to compare against ints.
2017-02-09 08:53:00 -07:00
Michael Calmer
cc1865345b
provide the possibility to put extra modules into the thin
2017-02-09 16:52:23 +01:00
Nicole Thomas
05d4df4a0e
Add __utils__ to sdb unit test ( #39261 )
...
Refs #39174
2017-02-09 08:52:16 -07:00
Michael Calmer
17dda94d39
support dryrun for dockerng.sls_build
2017-02-09 16:51:47 +01:00
rallytime
a9c2c106c1
Pylint fix
2017-02-09 08:50:56 -07:00
Daniel Wallace
6635a9fd3b
_device_mismatch_ignored will never be True
...
It will be the name of the device that has matched the regex
2017-02-09 09:45:24 -06:00
Sergei Zviagintsev
df82b11695
Do boolean check instead len() to test whether string is empty
...
Do a truth check to test whether a string is empty instead of using the
len() function. As @terminalmage mentioned in #39056 , this is about
twice faster; also this is what PEP8 says to do.
2017-02-09 16:21:57 +01:00
Roche, Damien
f4cf1dec11
salt/states/blockdev.py
2017-02-09 13:02:29 +00:00
Nitin Kumar
2cdfb882c3
Merge pull request #12 from rajvidhimar/bug-fixes
...
Add safety mechanism in shutdown function and add passwd as valid arg…
2017-02-09 17:50:51 +05:30
rajvidhimar
e297af1148
Remove blank line
2017-02-09 17:36:49 +05:30
rajvidhimar
207891c343
Add safety mechanism in shutdown fucntion and add passwd as valid argument
2017-02-09 17:34:47 +05:30
Nitin Kumar
a4a846ec27
Merge pull request #11 from rajvidhimar/bug-fixes
...
Lint and other changes
2017-02-09 16:56:44 +05:30
rajvidhimar
c4df77f20e
Change indentation
2017-02-09 16:54:09 +05:30
Roche, Damien
bcb58eba02
Refactor blockdev to use blkid instead of lsblk
2017-02-09 10:32:20 +00:00
rajvidhimar
4cb6c0ebd2
Lint and other changes
2017-02-09 12:25:34 +05:30
Daniel Wallace
e38c5d296b
fix pylint
2017-02-08 18:07:13 -06:00
rallytime
f6aad99db2
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- salt/loader.py
- salt/output/highstate.py
- salt/runners/fileserver.py
2017-02-08 16:57:54 -07:00
Nathan Grennan
d1bb38aacf
Fixing issue #39161 , salt-ssh : match:grain for pillars inconsistencies
2017-02-08 15:57:45 -08:00
Erik Johnson
1b9217d636
Update jsonschema tests to reflect change in jsonschema 2.6.0 ( #39260 )
...
Version 2.6.0 changed the wording of one of the exceptions tested,
causing tests to fail when jsonschema 2.6.0 is installed. This commit
updates the tests to change the assert for 2.6.0 and later.
2017-02-08 16:51:56 -07:00
Bruce Sherrod
46ebbfb925
comments
2017-02-08 15:41:09 -08:00
Bruce Sherrod
44d871212e
add boto_iam.export_roles, like boto_iam.export_users
2017-02-08 15:35:01 -08:00
Mike Place
3b585ed7fc
import re
2017-02-08 15:18:37 -07:00
Daniel Wallace
57ab8dd27b
add integration test
2017-02-08 16:08:50 -06:00
Mike Place
7611698474
Merge pull request #39238 from dmurphy18/fix_aix_disk_mount
...
Update disk fstype, inodeusage, percent and mount.active functions for AIX support
2017-02-08 14:53:31 -07:00
Erik Johnson
c1d16cc3d0
Better handling of enabled/disabled arguments in pkgrepo.managed ( #39251 )
...
This reverses the decision made in #35055 to deprecate the "enabled"
parameter in this state. This was a poorly-conceived decision, likely
made because the "enabled" param was not included in the docstring for
the pkgrepo.managed state under the "YUM/ZYPPER" section, while the
"disabled" param *was* listed under the "APT" section.
"disabled" isn't a thing in yum/dnf, so there was never any reason to
try to shoehorn it in. Not to mention the fact that the "disabled"
argument isn't even supported in Zypper, which effectively breaks Zypper
support.
This commit normalizes enabled/disabled based on platform, so passing
"enabled" in APT will pass the opposite value as "disabled", and
vice-versa on the other platforms. This allows enabled/disabled to be
used interchangeably.
It also more gracefully handles booleans in yum/dnf/zypper, so that a
bool can be properly compared to a 1/0 value.
2017-02-08 14:52:45 -07:00
Daniel Wallace
fa72d5b591
add clean_dynamic_modules to master default opts
2017-02-08 15:38:56 -06:00
Calle Pettersson
e5ecd8ecf2
Merge carlpett/salt-vault
2017-02-08 22:02:23 +01:00
Daniel Wallace
e6f243e4cd
add note to clean_dynamic_modules
2017-02-08 14:50:04 -06:00
Daniel Wallace
b0b2b5482b
add sync_sdb to salt-run saltutil
2017-02-08 14:43:40 -06:00
Daniel Wallace
413ae19592
document extmod_whitelist
...
for master and minion configs
2017-02-08 14:41:39 -06:00
Daniel Wallace
6c229396cc
add extmod_whitelist to the saltutil modules
2017-02-08 14:25:27 -06:00
Daniel Wallace
45d9a5f49c
add documentation for the global runas state option
2017-02-08 14:01:38 -06:00
Daniel Wallace
22d690945d
add optional extmod_whitelist dictionary
2017-02-08 13:52:27 -06:00
David Murphy
a8a519c493
Removed space for pylint
2017-02-08 12:42:14 -07:00
Mike Place
8e88f71dd9
Merge pull request #39227 from terminalmage/loader-optimization
...
Loader optimzation
2017-02-08 12:38:21 -07:00
David Murphy
8fa0ffa427
Updates due to code review comments
2017-02-08 12:38:14 -07:00
David Murphy
97c59a8d1c
Updated mount functionality for active on AIX
2017-02-08 12:38:14 -07:00
David Murphy
1a32b2cc89
Updated disk functionality for fstype, inodeuage and percent on AIX
2017-02-08 12:38:14 -07:00
Mike Place
bc89b297f8
Merge pull request #39228 from gtmanfred/2016.3
...
default to utf8 encoding if not specified
2017-02-08 12:36:57 -07:00
Mike Place
d9b0671dbd
Merge pull request #39231 from terminalmage/clarify-jenkins-depends
...
Add clarification for jenkins execution module
2017-02-08 12:34:45 -07:00
Mike Place
ddcff89a84
Merge pull request #39232 from terminalmage/issue21342
...
Avoid recursion in s3/svn ext_pillars
2017-02-08 12:33:27 -07:00
Mike Place
99bfa7dfee
Merge pull request #39233 from rallytime/fixup-more-doc-build-warnings
...
Various doc updates to fix warnings in doc build
2017-02-08 12:29:53 -07:00
Mike Place
59e927b520
Merge pull request #39237 from axmetishe/2016.11
...
fix rds subnet group creation
2017-02-08 12:04:30 -07:00
Daniel Wallace
be140e2b3c
add runas as a global state variable
2017-02-08 12:37:50 -06:00
Mike Place
5ca4d2000d
Merge pull request #39242 from adammichalik/salt-39214_ftp_authentication
...
Fixes #39214 . FTP authentication and clean disconnect.
2017-02-08 11:26:04 -07:00
Mike Place
87c808cb3f
Merge pull request #39245 from marcaurele/doc/toc-for-cloudstack
...
Add link in toc for cloudstack page
2017-02-08 11:24:46 -07:00
Simon Pirschel
daca2de84f
Pull request for #39193 ( #39244 )
...
* improved log_config documentation for #39193
* added log_config documentation for #39193
2017-02-08 10:46:27 -07:00
vnitinv
3d9dd685f5
Merge remote-tracking branch 'upstream/develop' into develop
2017-02-08 23:06:48 +05:30
Claudiu Popescu
86821ee70a
Fixes icinga2 module return code ( #38987 )
...
* Fixes icinga2 module return code
* Remove unused os import
2017-02-08 09:44:50 -07:00
