Nicole Thomas
7bed68743e
[2016.3] Pylint fix ( #39202 )
2017-02-06 14:42:30 -07:00
Josh Santos
0a3914a630
Fix lint errors
2017-02-06 16:02:35 -05:00
Nicole Thomas
c3e541e0a2
Merge pull request #39198 from rallytime/merge-2016.11
...
[2016.11] Merge forward from 2016.3 to 2016.11
2017-02-06 14:01:56 -07:00
Marc-Aurèle Brothier
786948ca98
Doc: add getting started page for CloudStack provider based on Exoscale as an example
...
Signed-off-by: Marc-Aurèle Brothier <m@brothier.org>
2017-02-06 21:13:38 +01:00
C. R. Oldham
9d8e72b881
Merge pull request #38339 from cloudflare/STRAIGHT-MINION
...
Migrate NAPALM modules to be used in both proxy and regular minion
2017-02-06 13:41:07 -06:00
Raine Curtis
c129905310
Added missing source_hash_name argument in get_managed function
...
Additional fix to #33187
Customer was still seeing errors, this should now work.
Tested with 2015.8.13 and 2016.11.2
2017-02-06 12:40:55 -07:00
C. R. Oldham
2a85d73f59
Merge pull request #39063 from cloudflare/ISS-39059
...
Avoid KeyError: 'multiprocessing' in the master logs
2017-02-06 13:37:34 -06:00
rallytime
7ea5f7f82f
Merge branch '2016.3' into '2016.11'
...
No conflicts.
2017-02-06 12:33:52 -07:00
Mike Place
c48192beff
Merge pull request #38781 from raazvvann/dev/rheghedu/nilrt_ip
...
Add network module for NILinuxRT: nilrt_ip.py
2017-02-06 12:30:43 -07:00
Jason Pack
69a790fd6e
Update junos.py
...
Called .keys() once instead of 10 times.
2017-02-06 14:24:37 -05:00
Mike Place
ab76054127
Merge pull request #39197 from cachedout/pr-38793
...
Pr 38793
2017-02-06 12:23:12 -07:00
Mike Place
f3d35fb5c6
Lint fixes
2017-02-06 12:20:08 -07:00
Mike Place
f8d79076f2
Merge pull request #39013 from terminalmage/zh878
...
Decryption of values in Pillar SLS files
2017-02-06 12:08:57 -07:00
ninja
60d0212e53
Change reload_modules to trigger only on state changes ( #39015 ) ( #39016 )
...
* Change reload_modules to trigger only on state changes (#39015 )
* Helps with performance
* 99.9% of the time used by Salt users along with pip.installed, pkg.installed or cmd.run which remain compatible.
* Creates minor incompatibility if used with a logically-incomplete state that does not properly report changes.
* Add option to force module reload even with no changes at state.py
* fix force_reload_modules logic
2017-02-06 12:06:38 -07:00
Mike Place
9454293499
Indexes for format statement
2017-02-06 11:59:11 -07:00
Mike Place
46d8bfd026
Merge pull request #39034 from rallytime/doc-updates-develop
...
Update autodoc topics for new modules added in develop
2017-02-06 11:53:41 -07:00
Mike Place
91c25bd651
Merge pull request #39083 from lomeroe/bp-36336
...
Backport #36336 to 2016.11
2017-02-06 11:50:52 -07:00
Calle Pettersson
5a017d733b
Clarify where sdb profiles need to be configured
2017-02-06 19:46:33 +01:00
Mike Place
b0ea6d74c9
Merge pull request #39099 from cloudflare/JINJA-LOG
...
Log module
2017-02-06 11:40:11 -07:00
Mike Place
157d98f21c
Merge pull request #39111 from mcalmer/update-min-version-dockerng
...
Update min required versions in dockerng
2017-02-06 11:39:02 -07:00
Mike Place
0b480a6244
Merge pull request #39140 from eradman/pillarenv
...
Allow pillar environment to be specified for salt-run
2017-02-06 11:38:35 -07:00
Mike Place
30455079fe
Merge pull request #39153 from nicholasmhughes/fix-selinux.mode-config-predictability
...
Fix selinux.mode state config file handling
2017-02-06 11:37:34 -07:00
Mike Place
7b5eb17cbe
Merge pull request #39159 from clinta/csr-crl-passphrase
...
Csr crl passphrase
2017-02-06 11:36:05 -07:00
Mike Place
b240468525
Merge pull request #39162 from meaksh/snapper-module-improvements
...
Adding more function to Snapper module
2017-02-06 11:33:52 -07:00
Mike Place
d56cc4d3fc
Merge pull request #39167 from rallytime/merge-develop
...
[develop] Merge forward from 2016.11 to develop
2017-02-06 11:27:36 -07:00
Mike Place
fa45cbc359
Merge pull request #39166 from Ch3LL/fix_boto_ec2_docs
...
fix boto ec2 module create_image doc
2017-02-06 11:27:16 -07:00
Mike Place
c4425b2c0b
Merge pull request #39168 from twangboy/fix_default_config
...
Add publisher_acl and publisher_acl_blacklist to defaults
2017-02-06 11:24:42 -07:00
Mike Place
3b4d5a4626
Merge pull request #39170 from grep4linux/jboss-state-fix
...
Added missing source_hash_name argument in get_managed function
2017-02-06 11:20:53 -07:00
Mike Place
6f9251ebed
Merge pull request #39171 from techhat/issue38370
...
Raise an error for a disk size that is too small
2017-02-06 11:19:45 -07:00
Mike Place
a40cb46249
Merge pull request #39173 from rallytime/restore-community-docs
...
Restore "Salt Community" doc section
2017-02-06 11:19:10 -07:00
Mike Place
2ba9fa67d8
Merge pull request #39176 from twangboy/win_iis
...
Updates to win_iis modules
2017-02-06 11:07:37 -07:00
Mike Place
a73edfdd70
Merge pull request #39177 from bwesterb/patch-1
...
pip_state: mention Python 2 pip module is required
2017-02-06 10:57:57 -07:00
Mike Place
036f36dc9b
Merge pull request #39179 from mcalmer/fix-dockerng-error-parsing
...
fix error parsing
2017-02-06 10:56:59 -07:00
Mike Place
f59f67fc41
Merge pull request #39183 from Inveracity/patch-3
...
update GCE docs adding subnetwork parameter
2017-02-06 10:31:15 -07:00
Mike Place
30f83156cb
Merge pull request #39189 from morganwillcock/sockstat
...
Fix NetBSD sockstat parsing
2017-02-06 10:28:07 -07:00
nicholasmhughes
8d8ba9c7d2
added the new getconfig function to the test
2017-02-06 09:55:09 -05:00
Morgan Willcock
344d13eff5
Fix NetBSD sockstat example
2017-02-06 11:38:34 +00:00
Morgan Willcock
64b693195c
Fix NetBSD sockstat parsing
...
Fixes NetBSD sockstat parsing so that presence events are fired correctly.
2017-02-06 11:08:31 +00:00
Inveracity
1962c778bd
update GCE docs adding subnetwork parameter
...
Updating docs to reflect merge #39072
2017-02-05 12:12:35 +01:00
Josh Santos
ee7185c125
Fix crashes when source attr is missing, as well as when description tag is missing in source image
2017-02-05 00:45:59 -05:00
Morgan Willcock
d7e05091a2
Remove global options from Install
2017-02-04 19:00:36 +00:00
Michael Calmer
6750ccd78e
fix error parsing
2017-02-04 16:05:45 +01:00
Bas Westerbaan
82d9642f30
pip_state: mention Python 2 pip module is required
...
To use the pip state for Python 3, the pip module for Python 3 *and* Python 2 are required to be installed. This adds "Python 2" in the error message when the Python 2 pip module can't be found.
2017-02-04 11:21:34 +01:00
twangboy
d6801a7768
Remove raise from _srvmgr
2017-02-03 17:25:15 -07:00
twangboy
3a32af777b
change to return_json
2017-02-03 17:17:01 -07:00
twangboy
ae45cfe731
Updates to win_iis modules
2017-02-03 17:14:54 -07:00
Joseph Hall
94a6055520
Type check for utils
2017-02-03 17:08:18 -07:00
Joseph Hall
9da906146c
Add __opts__ and __utils__ to SDB
2017-02-03 17:05:17 -07:00
rallytime
5aeddf42a0
Restore "Salt Community" doc section
...
This was moved to the `topics/index.rst` page in PR #10792 , but
seems to have been accidentally removed in PR #30770 .
2017-02-03 16:43:04 -07:00
Joseph Hall
ec57a39c00
Typo
2017-02-03 14:27:45 -07:00