Commit Graph

75491 Commits

Author SHA1 Message Date
Mike Place
9e4e936f4f Merge pull request #37473 from m03/fix-167-logrotate-state_2
Fix #167 - Add logrotate state module
2016-11-06 14:45:15 +13:00
Mike Place
706befd8ca Merge pull request #37476 from pakdel/ec2_cloud_driver_fix
EC2 support for SubnetName and securityGroupName
2016-11-06 14:43:09 +13:00
Mike Place
1c993bf8c2 Merge pull request #37488 from SaltyCharles/patch-3
update note on beacon.disabled
2016-11-06 14:35:31 +13:00
Mike Place
bc17271aae Merge pull request #37490 from twangboy/win_dacl_util
Create new salt util win_dacl
2016-11-06 14:35:12 +13:00
Mike Place
713607c0ee Merge pull request #37489 from lorengordon/issue-18836
Creates `filter_by` as a utils function
2016-11-06 14:34:52 +13:00
twangboy
f4df20d5be Fix some lint 2016-11-04 22:17:05 -06:00
twangboy
d8ce75ec42 Clean up docs 2016-11-04 19:01:36 -06:00
twangboy
ffb21ae882 Fix some syntax errors, string type checks 2016-11-04 18:46:20 -06:00
twangboy
52839f9dd0 Fix verify 2016-11-04 18:46:20 -06:00
twangboy
0e2e587496 Fix some syntax issues 2016-11-04 18:46:20 -06:00
twangboy
6bb7b322e0 Add documentation to win_dacl util 2016-11-04 18:46:20 -06:00
twangboy
2e64488f64 Fix minion startup 2016-11-04 18:46:20 -06:00
twangboy
f9f60e0f99 Fix docs 2016-11-04 18:46:20 -06:00
twangboy
2acd7deaed Use win_dacl utility to verify environment 2016-11-04 18:46:20 -06:00
Loren Gordon
4acd251b90 Creates filter_by as a utils function
The primary reason for moving this to utils is to add support for
a `pillar.filter_by()` function while minimizing any code
duplication.

Fixes #18836
2016-11-04 17:58:15 -04:00
SaltyCharles
6fa99d9e6b update note on beacon.disabled
fix typo
2016-11-04 14:49:11 -07:00
Nicole Thomas
029d822d92 Merge pull request #37480 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2016-11-04 15:27:20 -06:00
Nicole Thomas
a330866a17 [develop] Doc version updated to 2016.3.4 (#37484) 2016-11-04 14:13:34 -06:00
rallytime
ce4b82fdee Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/modules/archive.py
  - salt/modules/status.py
  - salt/states/file.py
  - tests/unit/modules/status_test.py
2016-11-04 13:51:46 -06:00
Amir Pakdel
783f58bf3d EC2 support for SubnetName and securityGroupName
Now we can have subnetname and securitygroupname
in network_interfaces of EC2 cloud profiles:
profile_name:
  size: t2.medium
  network_interfaces:
  - DeviceIndex: 0
    allocate_new_eip: true
    subnetname: subnet01
    securitygroupname:
    - sgLinux
    - sgServer1
    - sgServer2
2016-11-04 14:16:02 -04:00
m03
466efd3f55 Change test str to int for consistency 2016-11-04 09:43:02 -07:00
m03
2f80d4b853 Fix #167 - add logrotate state 2016-11-04 09:07:42 -07:00
Mike Place
dd5cb52ed4 Merge pull request #37124 from eradman/sunos
Unbreak _check_cmdline() on SunOS distributions
2016-11-04 18:58:54 +13:00
Mike Place
c734e4d172 Merge pull request #37200 from skizunov/develop2
Windows: Add log file rotation support
2016-11-04 18:50:02 +13:00
Mike Place
898d28d2c9 Merge pull request #37237 from lyft/add-kinesis-support
Add Amazon Kinesis support via boto3
2016-11-04 18:30:43 +13:00
Mike Place
00e831fa4d Merge pull request #37311 from cloudflare/NET-MODULE-UPDATE
Some more features for napalm_network
2016-11-04 18:07:19 +13:00
Mike Place
6712fff088 Merge pull request #37370 from cloudflare/PROBES-STATE-UPDATE
Probes state update
2016-11-04 18:03:28 +13:00
Mike Place
d86ec7372f Merge pull request #37374 from cloudflare/NAPALM-USERS-MODULE
New execution module: napalm_users
2016-11-04 18:00:46 +13:00
Mike Place
964ee74ddd Merge pull request #37412 from fictivekin/boto_lc-named-secgroups
Allow specifying a VPC for named security groups
2016-11-04 17:49:09 +13:00
Mike Place
20f2b471d4 Merge pull request #37421 from cloudflare/REDIS-MOD-FUNS
More redis hash functions
2016-11-04 17:37:02 +13:00
Mike Place
c98f2eed8b Merge pull request #37434 from cloudflare/NAPALM-USERS-STATE
New state module: netusers
2016-11-04 17:20:09 +13:00
Mike Place
2ce17df223 Merge pull request #37435 from ccin2p3/iface-aliases
Fix interface_status for secondary interfaces.
2016-11-04 17:13:30 +13:00
Mike Place
0b605830ed Merge pull request #37453 from gtmanfred/develop
Begin deprecating default setting dns entries in the lxc module
2016-11-04 17:12:33 +13:00
Mike Place
52556c857b Capitalize dns 2016-11-04 16:27:45 +13:00
Mike Place
d5792b78f7 Merge pull request #37460 from gtmanfred/docs
remove swig and m2crypto from hacking.rst
2016-11-04 16:20:59 +13:00
Daniel Wallace
2b133474e5 remove swig and m2crypto from hacking.rst 2016-11-03 19:33:50 -05:00
Megan Kercher
1f68bd11f2 doc module file 2016-11-03 16:32:23 -07:00
Thomas S Hatch
61f57701dc Merge pull request #37456 from gtmanfred/docs
clean up HACKING.rst doc
2016-11-03 15:50:04 -06:00
Daniel Wallace
ad3a72388d clean up HACKING.rst doc
Also fix a spelling mistake in .github/contributing.rst
2016-11-03 16:47:59 -05:00
Daniel Wallace
8a28ac4fdb Begin deprecating default setting dns entries
We shouldn't be setting defaults for this.  They should have to be
explicitly set because they could also be set by dhcp.

Fixes #37381
2016-11-03 16:04:45 -05:00
Megan Kercher
805bcb31b2 lint states file 2016-11-03 10:16:39 -07:00
Megan Kercher
8decc237d0 lint module file 2016-11-03 10:13:34 -07:00
Jared McKnight
ca80e49a4d force use of keyword args for boto_asg.launch_configuration_exists 2016-11-03 12:25:47 -04:00
fbretel
c1caf7bafd Fix interface_status for secondary interfaces. 2016-11-03 13:49:11 +01:00
Mircea Ulinic
cdc521f28c
Add seealso section 2016-11-03 11:29:14 +00:00
Mircea Ulinic
c0a93dfc52
Update console message 2016-11-03 11:26:37 +00:00
Mircea Ulinic
8e087c9596
napalm_users doc 2016-11-03 11:23:41 +00:00
Mircea Ulinic
5b734eb1d5
New state: users 2016-11-03 11:20:43 +00:00
Mircea Ulinic
0590c9142f
Doc for exec mod napalm_users 2016-11-03 10:35:37 +00:00
Mircea Ulinic
54470dc303
New execution module: napalm_users 2016-11-03 10:35:01 +00:00