Mike Place
0b70ed7d06
Merge pull request #41913 from twangboy/win_servermanager
...
Win servermanager
2017-06-27 12:46:11 -05:00
garethgreenaway
39397316cc
Merge pull request #41867 from onlyanegg/datadog_execution_module
...
Datadog execution module
2017-06-24 08:00:25 -07:00
garethgreenaway
e66b0cda87
Merge branch 'develop' into datadog_execution_module
2017-06-23 15:46:12 -07:00
twangboy
b2c13654ac
Fix unit tests
2017-06-23 15:57:47 -06:00
twangboy
46924be8d3
Fix some lint
2017-06-23 15:25:45 -06:00
Mike Place
f0429ba0c6
Merge pull request #41820 from nhavens/develop
...
Fix yum repo file comments to work as documented in pkgrepo.managed
2017-06-23 11:55:43 -05:00
coutotyler
67e4a5ef82
Merge branch 'datadog_execution_module' of github.com:onlyanegg/salt into datadog_execution_module
2017-06-23 09:47:05 -07:00
Mike Place
aff5d76081
Merge pull request #41918 from rongzeng54/develop
...
force glibc to re-read resolv.conf for fix unexpected error dns parsing
2017-06-23 11:39:20 -05:00
Mike Place
3ea37af9e9
Merge pull request #41903 from AFriemann/develop
...
added Void linux family to iptables _conf function
2017-06-23 11:31:43 -05:00
Mike Place
481dc72edf
Merge pull request #41895 from yagnik/patch-1
...
Update documentation of beacons
2017-06-23 11:30:44 -05:00
zr
7a4b153020
- move the task of re-reading resolv.conf to a function
...
- call the function of re-reading resolv.conf when the http server use domain name
2017-06-23 22:08:59 +08:00
coutotyler
8ec73806f4
Style changes from pylint
2017-06-22 22:10:39 -07:00
Neile Havens
6b793bd00b
Merge branch 'develop' into develop
2017-06-22 18:29:49 -05:00
Shane Lee
e48bf8fef4
Merge branch 'develop' into win_servermanager
2017-06-22 16:51:11 -06:00
twangboy
c5f6e94dfd
Add ability to pass features list in state
2017-06-22 16:31:59 -06:00
Mike Place
d1f80bab39
Merge pull request #41901 from coolstone16/httpquery_receive_opts
...
Allow modifiable opts for http.query in module and runner.
2017-06-22 15:36:33 -05:00
garethgreenaway
bd3ed3a7c5
Merge branch 'develop' into patch-1
2017-06-22 12:00:30 -07:00
Mike Place
fb008e6f84
Merge pull request #41144 from terminalmage/issue34775
...
gitfs: Add two new options to affect saltenv mapping
2017-06-22 12:05:49 -05:00
Mike Place
b0b091b133
Merge pull request #41817 from pruiz/enhancements-to-rh-ip-config
...
Addresses rh_ip's shortcomings when configuring balance-rr bonds with miimon monitoring, as well as adding support for 'advertise' ethtool's setting.
2017-06-22 11:38:21 -05:00
garethgreenaway
5709cbbde5
Merge branch 'develop' into patch-1
2017-06-22 09:34:39 -07:00
Mike Place
8da1c2a1eb
Merge pull request #41884 from nicholasmhughes/allow-empty-emailaddress-in-tls
...
Remove the default value for emailAddress in the tls module
2017-06-22 11:32:30 -05:00
Neile Havens
1f259ca022
Merge branch 'develop' into develop
2017-06-22 11:22:20 -05:00
aditya.raj
ac3679770b
Use <dict>.copy() for assignment
2017-06-22 21:04:05 +05:30
Aljosha Friemann
64e4842e6c
added Void linux family to iptables _conf function
2017-06-22 16:52:39 +02:00
aditya.raj
f72c2820f2
Allow modifiable opts for http.query module and runner.
...
Passing on the opts as kwargs currently fails with repeated keyword argument error.
2017-06-22 19:56:17 +05:30
Erik Johnson
b598c1e5a6
Merge pull request #41899 from arnoschuring/execution-module-docs
...
Execution module docs
2017-06-22 08:45:24 -05:00
Neile Havens
fee59e8159
Merge branch 'develop' into develop
2017-06-22 07:13:12 -05:00
Arno Schuring
e9d381ae6b
Merge branch 'develop' into execution-module-docs
2017-06-22 13:45:05 +02:00
Yagnik
2f32db6d7b
Update documentation of beacons
...
Update beacons documentation to let the user know that beacons can also be set in pillars like other configs.
2017-06-22 10:10:42 +05:30
twangboy
85b9764cb4
Add ability to pass multiple features for in/uninstall
2017-06-21 17:26:54 -06:00
nicholasmhughes
473c18bff4
Allow the emailAddress field to be empty and don't supply a default value. Email address is an optional field
...
and makes DNs... interesting.
2017-06-21 14:26:31 -04:00
Erik Johnson
798567b766
Add new gitfs config options to mocked opts
2017-06-21 12:42:48 -05:00
Erik Johnson
1279f56c56
gitfs: Add two new options to affect saltenv mapping
...
This adds 2 new config options:
- gitfs_disable_saltenv_mapping - This allows a user to disable the environment mapping logic and rely solely on per-saltenv configuration
- gitfs_ref_types - This allows individual ref types to be ignored
It also includes a performance improvement in retrieving tree objects
matching the desired ref name. Before, we would iterate through the
different refs and check if the name matched the desired ref's name.
Now we just check for a head/tag ref based on the ref path in the
gitdir (e.g. refs/remotes/origin/master or refs/tags/v1.2.3). This
prevents us from needlessly iterating through all refs until a match is
found, which does not scale well when the number of branches and tags is
larger.
2017-06-21 12:42:48 -05:00
Mike Place
31d51e7093
Merge pull request #41871 from cloudflare/thorium-work
...
Various additions for Thorium
2017-06-21 12:26:29 -05:00
Mike Place
8df2888f61
Remove unused import
2017-06-21 11:26:18 -06:00
Mike Place
8114d3da03
Merge pull request #41525 from rocket-labs-sysadmins/feature-36456
...
Add more functions to boto_elbv2 module
2017-06-21 12:14:58 -05:00
garethgreenaway
5ae8983ad5
Merge branch 'develop' into thorium-work
2017-06-21 09:40:23 -07:00
garethgreenaway
ae6e08281c
Merge branch 'develop' into enhancements-to-rh-ip-config
2017-06-21 08:34:42 -07:00
Mike Place
e9bb2b6fdc
Merge pull request #41866 from whiteinge/rest_cherrypy-ssl-version-range
...
rest_cherrypy SSL version range update
2017-06-21 10:31:11 -05:00
garethgreenaway
42a09267d6
Merge branch 'develop' into datadog_execution_module
2017-06-21 08:27:16 -07:00
garethgreenaway
b43d01808b
Merge branch 'develop' into thorium-work
2017-06-21 08:26:26 -07:00
garethgreenaway
30025a281e
Merge branch 'develop' into develop
2017-06-21 08:20:01 -07:00
garethgreenaway
7bb81df919
Merge pull request #41873 from ashishdisawal/develop
...
Updated documentation of iptables module
2017-06-21 08:18:28 -07:00
Ashish Disawal
4a0cfe9787
Merge branch 'develop' into develop
2017-06-21 18:03:16 +05:30
Ashish Disawal
c092eb0506
Updated documentation of iptables module
...
The documentation said use '--state' in build_rule, but 'state' kwarg is being ignored at line 246.
In bash, the --source '! 127.0.0.1' did not work, but --source '!127.0.0.1' did.
2017-06-21 17:50:12 +05:30
Mircea Ulinic
3e2e6196b9
Add count_* kwargs for the contains function
2017-06-21 11:21:33 +00:00
Mircea Ulinic
9e681943c2
Reverting to redundant code, as __reg__ is not available
2017-06-21 11:21:28 +00:00
Mircea Ulinic
35e06545c4
Add register length check functions
2017-06-21 11:21:24 +00:00
Mircea Ulinic
d1e300c438
Avoid redundant code
2017-06-21 11:21:19 +00:00
coutotyler
7a3b06d2b2
Removing unneeded modules
2017-06-20 22:37:30 -07:00
