Thomas S Hatch
e23e4f6ef8
Merge pull request #23309 from rmcleay/secgroup_egress
...
Egress rule support for boto_secgroup
2015-05-04 14:57:02 -06:00
Justin Findlay
b224d823eb
Merge pull request #23308 from thusoy/patch-2
...
Don't merge: Add missing jump arguments to iptables module
2015-05-04 09:09:15 -06:00
Justin Findlay
55e2185b02
Merge pull request #23328 from s0undt3ch/develop
...
Py3 fix & unrelated .pylint fix
2015-05-04 09:08:46 -06:00
Justin Findlay
83b62b47d9
Merge pull request #23322 from thusoy/patch-3
...
Silence iptables checks
2015-05-04 09:00:12 -06:00
Pedro Algarvio
c4bba0ca3a
Python 3 fix
2015-05-04 15:26:05 +01:00
Pedro Algarvio
171e022331
Start checking code to enforce a minimum python version support
2015-05-04 15:25:38 +01:00
Tarjei Husøy
275147d131
Silence iptables checks
...
Prevents error logging for every iptables run.
2015-05-04 13:34:31 +02:00
Tarjei Husøy
64f661d2cc
Add missing jump arguments to iptables module
...
I think this is all the arguments supported.
Also adds test for no-arg options and adds some docs on no-arg.
Point to discuss:
- The --save option crashes with our defined --save option. Probably
no rush since no one's complained so far, but this should be fixed.
Maybe we can rename this one to connsecmark-save, since it only appears
as an option to the CONNSECMARK jump target? Maybe also rename restore
to connsecmark-restore too, for consistency, even though restore
doesn't collide with anything?
2015-05-04 13:19:23 +02:00
Robert McLeay
57067a3c0f
Fixing linting in boto_secgroup module and unit test.
2015-05-04 15:45:26 +10:00
Robert McLeay
78e22e6d38
Fixed 'all' protocol case for boto_secgroup state.
2015-05-04 15:45:26 +10:00
Robert McLeay
0361d39342
Added rules_egress docs for boto_secgroup state.
2015-05-04 15:45:26 +10:00
Robert McLeay
c2695986fe
Added rules_egress to boto_secgroup unit test.
2015-05-04 15:45:25 +10:00
Robert McLeay
ce3fb4ba70
Added initial states.boto_secgroup support for egress rules.
2015-05-04 15:45:25 +10:00
Robert McLeay
59fc64fc7a
Added initial module.boto_secgroup support for egress rules.
2015-05-04 15:45:13 +10:00
Nicole Thomas
c85094df5d
Merge pull request #23305 from farcaller/typo
...
Fixed a Runenr typo in the docs
2015-05-03 14:43:27 -06:00
Nicole Thomas
a624abddae
Merge pull request #23306 from nmadhok/vmware-cloud-driver
...
VMware cloud driver doc fixes
2015-05-03 14:42:17 -06:00
Nitin Madhok
49f5789934
VMware cloud driver doc fixes
2015-05-03 16:14:07 -04:00
Vladimir Pouzanov
921aaea9b4
Fixed a Runenr typo in the docs
2015-05-03 18:47:15 +01:00
Nicole Thomas
be7d11dfe9
Merge pull request #23300 from nmadhok/vmware-cloud-driver
...
Fixing bugs causing errors when creating VM using VMware cloud driver
2015-05-03 09:51:12 -06:00
Nitin Madhok
a5edd45fbb
Fixing bug that caused error during creating VM if network was not specified under devices Fixes #23301
2015-05-03 03:34:19 -04:00
Nitin Madhok
c860cc42a2
Fixing bug that caused hostname error when using FQDN as the vm name Fixes #23213
2015-05-02 23:24:22 -04:00
Thomas S Hatch
7246e7dd37
Merge pull request #23299 from jodv/localcache_fast_cleanup
...
Fix st_ctime in local_cache returner update
2015-05-02 20:32:12 -06:00
Jeremy Rosenbaum
cf94a2bd2f
st_ctime is an attribute, not a method
2015-05-02 18:15:18 -07:00
Thomas S Hatch
755f048f66
Merge pull request #23243 from cachedout/fix_pillar_stacktraces
...
[EXPERT REVIEW REQUIRED] Remove grains workaround from pillar generation
2015-05-02 18:43:58 -06:00
Thomas S Hatch
c607145d4f
Merge pull request #23296 from chris-prince/develop
...
Fixed issue #18880 in develop branch
2015-05-02 18:43:25 -06:00
Thomas S Hatch
e0af0ed089
Merge pull request #23287 from UtahDave/add_upload_path
...
Allow for modifying the path of uploaded file inside of master cache dir.
2015-05-02 18:43:06 -06:00
Thomas S Hatch
bf867c6231
Merge pull request #23282 from lisa2lisa/iss23201
...
Iss23201-fix the revoke *.* bug for mysql module
2015-05-02 18:42:33 -06:00
Thomas S Hatch
1a93deaf17
Merge pull request #23275 from terminalmage/issue5504
...
Add pkg.group_installed state
2015-05-02 18:41:39 -06:00
Thomas S Hatch
b5c75d122a
Merge pull request #23273 from jodv/localcache_fast_cleanup
...
use ctime for old jobs cleanup in local cache returner
2015-05-02 18:41:09 -06:00
Thomas S Hatch
8f8214ef05
Merge pull request #23265 from basepi/merge-forward-develop
...
Merge forward from 2015.2 to develop
2015-05-02 18:40:31 -06:00
Thomas S Hatch
944074eae1
Merge pull request #23255 from froztbyte/develop
...
[docs/pkg] add some clarity around custom repo usage in pkg/pkgs
2015-05-02 18:39:55 -06:00
Thomas S Hatch
3071c6d4ee
Merge pull request #23253 from The-Loeki/better-ipv6
...
#22080 Parts 2 & 3: Deprecation & Removal of ipaddr and IPv4Address
2015-05-02 18:38:56 -06:00
chris-prince
023fab7fc3
Fixed issue #18880 in develop branch
2015-05-02 11:22:18 -07:00
Justin Findlay
0b36c33079
Merge pull request #23285 from makinacorpus/boto
...
Boto check
2015-05-01 21:53:43 -06:00
Nicole Thomas
7287138aa6
Merge pull request #23267 from jtand/http_pylint
...
Fixed pylint error for python3 compatibility in salt/utils/http.py
2015-05-01 19:45:47 -07:00
Nicole Thomas
f95dcac621
Merge pull request #23268 from basepi/salt-ssh.thin.tornado
...
Add tornado to salt-thin
2015-05-01 19:30:28 -07:00
Nicole Thomas
d2a477eb61
Merge pull request #23291 from cachedout/transport_docs
...
Document 0MQ transport
2015-05-01 18:47:37 -07:00
Mike Place
5a9f819ce7
Document 0MQ transport
2015-05-01 16:37:22 -06:00
David Boucha
c4cf0a687a
Add upload_path to cp.push_dir
2015-05-01 15:55:07 -06:00
David Boucha
72ed91a00b
Add 'upload_path' option
...
This allows for renaming the file and the path inside the
master's job cache.
2015-05-01 15:54:59 -06:00
Mathieu Le Marec - Pasquet
14daaa91b5
Boto check
...
This refs #23277
2015-05-01 23:41:14 +02:00
Seth House
bdfb589621
Merge pull request #23276 from whiteinge/missing-docs-pt-deux
...
Fix the build process for a few empty docs
2015-05-01 14:28:44 -06:00
Seth House
d844ca5112
Removed docs for ext_pillar module that is a wip
2015-05-01 14:24:01 -06:00
Seth House
6be273d5f3
Removed stormpath_mod and linodepy docs; these were renamed
2015-05-01 14:24:00 -06:00
Joseph Hall
0c53340e9d
Merge pull request #23266 from nmadhok/bug-fix-vmware
...
Fixing issues with VMware cloud driver create function
2015-05-01 14:16:26 -06:00
Seth House
cda915bcd4
Remove fsutils module documentation
...
This module was moved to the utils folder in #17883 .
2015-05-01 14:13:59 -06:00
Seth House
901fa33440
Mocked tornado.httputil
...
Refs #22820
2015-05-01 13:57:43 -06:00
Erik Johnson
3c55aba754
lint fixes
2015-05-01 14:25:58 -05:00
Erik Johnson
37a84e2a13
Add pkg.group_installed state
...
Resolves #5504 .
2015-05-01 13:39:17 -05:00
Erik Johnson
282ec1b8ec
Exclude groupinstall alias from docs
2015-05-01 13:38:45 -05:00
