Commit Graph

52335 Commits

Author SHA1 Message Date
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
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
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
Erik Johnson
3f0331405b Move group_install with the other group funcs
Also added an alias for groupinstall to group_install, to match the yum
CLI usage.
2015-05-01 13:38:00 -05:00
Jeremy Rosenbaum
d42a83cc14 use ctime for old job cleanup 2015-05-01 11:37:09 -07:00
Ronald van Zantvoort
d814b7f9a3 Better unit test fix, add 2 unit tests for IPv6 2015-05-01 20:29:25 +02:00
Colton Myers
9fcc3a7689 Add tornado to the thin 2015-05-01 11:53:42 -06:00
Justin
9c1f84efac Fixed pylint error for python3 compatibility in salt/utils/http.py 2015-05-01 11:47:24 -06:00
Colton Myers
c7d2155123 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-05-01 11:44:10 -06:00
Nitin Madhok
846519cc5f Fixing issues with VMware cloud driver create function Fixes #23262 #23264 2015-05-01 13:43:59 -04:00
Nicole Thomas
b76807addc Merge pull request #23260 from jtand/locales_pylint
Locales pylint
2015-05-01 10:36:42 -07:00
Ronald van Zantvoort
d81fbc4bc3 Unit test fix 2015-05-01 19:34:08 +02:00
Ronald van Zantvoort
5346a07e6e Removal of embedded IPv4Address class 2015-05-01 19:01:42 +02:00
Ronald van Zantvoort
8839a72162 Replace dependendy on embedded IPv4Address class from utils/network 2015-05-01 19:00:08 +02:00
Ronald van Zantvoort
bb91de0f83 Change is_loopback, is_private and reverse_ip to utilize the ipaddress lib
(removes dependency on embedded IPv4Address in utils.network)
2015-05-01 18:49:40 +02:00
Justin
2defe02c88 Fixed pylint error in /salt/utils/locales.py 2015-05-01 10:32:29 -06:00
Justin
922f1f38a4 Fixed pylint error in /salt/utils/locales.py 2015-05-01 10:30:22 -06:00
Joseph Hall
4b836e0b17 Merge pull request #23251 from nmadhok/vmware-portgroup
Adding support to be able to specify distributed virtual port group or standard switch network upon VM creation
2015-05-01 09:02:25 -06:00
JP Viljoen
f4abf7f03a [docs/pkg] add some clarity around custom repo usage in pkg/pkgs 2015-05-01 15:59:44 +02:00
Ronald van Zantvoort
394a044d54 Removal of ipaddr 2015-05-01 13:03:45 +02:00
Ronald van Zantvoort
2c111faac3 Deprecation of ipaddr
Modified roster/scan to be IP-agnostic
2015-05-01 12:52:59 +02:00
Ronald van Zantvoort
34ccbda865 Merge branch 'develop' of https://github.com/saltstack/salt into better-ipv6 2015-05-01 11:56:14 +02:00
Ronald van Zantvoort
73876ae363 Fix for hosts() in IPv6Network 2015-05-01 10:39:38 +02:00
Thomas S Hatch
5188d6cbf7 Merge pull request #23235 from techhat/tornadoclient
Add tornado to http.query, and make it the default
2015-04-30 19:42:30 -06:00
Thomas S Hatch
3e6823cebf Merge pull request #23234 from nmadhok/vmware-cloud-driver
Adding reboot_host() to be able to reboot a host system
2015-04-30 19:41:14 -06:00
Thomas S Hatch
cad5d77b96 Merge pull request #23225 from skizunov/develop
Fix engines on Windows
2015-04-30 19:40:53 -06:00
Nitin Madhok
dc7903b110 Adding support to be able to add distributed virtual portgroup to vm upon creation 2015-04-30 21:34:31 -04:00
Justin Findlay
17f32d137f Merge pull request #23238 from basepi/merge-forward-develop
Merge forward from 2015.2 to develop
2015-04-30 19:31:40 -06:00
Justin Findlay
f591a717d9 Merge pull request #23237 from basepi/merge-forward-2015.2
[2015.2] Merge forward from 2014.7 to 2015.2
2015-04-30 19:31:10 -06:00
Justin Findlay
7e58b06d89 Merge pull request #23248 from nmadhok/patch-vmware-driver
Making sure that the key exists in dict and doesn't fail if devices have not been specified
2015-04-30 19:22:20 -06:00
Justin Findlay
e1f150f5eb Merge pull request #23229 from jtand/boto_pylint
Boto pylint
2015-04-30 18:03:39 -06:00
Nitin Madhok
ee84650848 Making sure that the key exists in dict Fixes #23247 2015-04-30 19:45:41 -04:00
Justin
1a49ecfd16 Last pylint fix... 2015-04-30 15:41:07 -06:00