Commit Graph

62590 Commits

Author SHA1 Message Date
Z. Liu
d34e6b1a9a use read only if has read() method 2015-11-27 08:02:02 +08:00
Jorge Schrauwen
40664b2cff also we should keep returning {} for other systems 2015-11-26 22:20:30 +00:00
Jorge Schrauwen
acd661287d forgot to remove a debug line, how embarasing 2015-11-26 22:16:22 +00:00
Jorge Schrauwen
96faf10b3e fix docs in salt/utils/network.py #29231 - looks like this got copied at some point 2015-11-26 22:09:31 +00:00
Jorge Schrauwen
a9cec746d7 fixup network.default_route with family set on SunOS #29233 2015-11-26 22:07:41 +00:00
Jorge Schrauwen
e51970cf87 fix network.active_tcp on SunOS (we fake it until we make it) #29232 2015-11-26 21:59:03 +00:00
Jorge Schrauwen
626d906997 add decorator to network.dig #29234 2015-11-26 21:37:33 +00:00
Jorge Schrauwen
12c579e2ae fix docstring for get_bufsize #29235 2015-11-26 21:36:39 +00:00
Jorge Schrauwen
f35cdc6656 fix docstring for mod_bufsize #29236 2015-11-26 21:35:22 +00:00
Pedro Algarvio
d6d3d94b87 Fix the engines_dirs config option name. 2015-11-26 18:31:20 +00:00
codehotter@gmail.com
f96bfc1d46 Fix another call to _get_node
As of 25771fc030 _get_node returns
instance information directly rather than as a dictionary.

This call to _get_node should have been modified in that commit,
but was overlooked.
2015-11-26 18:17:12 +01:00
mephi42
bf41418968 fileclient: support @ sign in user names
When user name contains @ sign, url_data.netloc looks like this:

    user@company:password@host

In order to properly strip credentials, we need to take the
fragment following the last @ sign, not the first one.
2015-11-26 19:56:33 +03:00
Dmitry Kuzmenko
1b30426368 Implemented batch wait timer 2015-11-26 19:04:34 +03:00
Nicolas Delaby
a0b674a0ea Extend documentation of network_mode parameter. 2015-11-26 12:11:32 +01:00
Arthur Lutz
2dfdc7e4fa typo in docstring 2015-11-26 12:07:51 +01:00
Z. Liu
9bdaae8325 show duration only if state_output_profile is False 2015-11-26 13:13:14 +08:00
Z. Liu
3209c1cdb5 size is 0 doesn't mean no data, e.g, /proc/version 2015-11-26 13:01:01 +08:00
Bastiaan Bakker
5226cd8f79 remove trailing whitespace
fix subdict_match test cases
2015-11-25 20:41:13 -07:00
Bastiaan Bakker
44713cdb95 fix issue 29191: only try partial matches when a wildcard has been specified 2015-11-25 20:41:13 -07:00
Justin Findlay
9236188867 Merge pull request #29214 from cro/ssl_verify_ssl
Doc for salt.utils.http should say verify_ssl not ssl_verify.
2015-11-25 16:55:38 -07:00
Justin Findlay
b225263279 Merge pull request #29208 from whytewolf/glance_more_profile_errors
Glance more profile errors
2015-11-25 16:50:27 -07:00
C. R. Oldham
e9c13c561b Doc bug--salt.utils.http takes verify_ssl not ssl_verify. 2015-11-25 15:57:31 -07:00
rallytime
44e7f83686 Move _wait_for_task func from vmware cloud to vmware utils 2015-11-25 14:32:08 -07:00
Mike Place
7bd15621c8 Merge pull request #29192 from bastiaanb/fix/issue-29191-subdict_match-regression
fix issue 29191: only try partial matches when a wildcard has been sp…
2015-11-25 13:06:39 -07:00
Mike Place
6d3c04516f Merge pull request #29200 from jfindlay/singular_umount
mount state: unmount by device is optional
2015-11-25 13:03:22 -07:00
Mike Place
df7b35a86b Merge pull request #29204 from lorengordon/fix-29202
Use os.path.join to return full path to ca bundle
2015-11-25 13:00:42 -07:00
Mike Place
fffcf9fef6 Merge pull request #29205 from trevor-h/fix-salt-cloud-winrm-ec2
Fixes #29187 - using winrm on EC2
2015-11-25 13:00:01 -07:00
Jorge Schrauwen
feafbeb0f9 implement zpool.healthy and update zpool.list 2015-11-25 19:58:41 +00:00
Mike Place
1937a47dec Merge pull request #29170 from cachedout/refactor_pydsl_test
Migrate pydsl tests to integration test suite
2015-11-25 12:56:48 -07:00
Justin Findlay
5de0b93ac6 saltutil.cmd module: do not shadow ret function argument
Fixes #29161.
2015-11-25 12:32:36 -07:00
Justin Findlay
7809f2a389 saltmod.state state: do not shadow ret function argument 2015-11-25 12:32:35 -07:00
Thomas Phipps
c8fe514ec1 found 3 more spots where the profile was not being passed through. 2015-11-25 11:31:30 -08:00
Thomas Phipps
b2e3c1f8de Merge pull request #1 from saltstack/2015.8
2015.8
2015-11-25 11:17:52 -08:00
Trevor Hammond
48e0edd0d2 Fixes #29187 - using winrm on EC2 2015-11-25 18:36:45 +00:00
Thomas Desrosiers
56b3302fe9 Pylint fixes for PR #29139 2015-11-25 13:35:10 -05:00
Loren Gordon
b1dae5e6fe Use os.path.join to return full path to ca bundle
Fixes #29202
2015-11-25 13:34:44 -05:00
Mike Place
11d68f7b1c Merge pull request #29198 from jfindlay/single_mtu
rh_ip module: only set the mtu once
2015-11-25 11:11:09 -07:00
Mike Place
f19355e0bb Merge pull request #29135 from jfindlay/ssh_except
ssh_known_hosts.present state: catch not found exc
2015-11-25 11:10:43 -07:00
Mike Place
ccf46a44bb Merge pull request #29185 from jirikotlin/develop
Support of tunnels in openvswitch modules.
2015-11-25 10:55:35 -07:00
Mike Place
2477ff2eab Add __init__ and pydsl test 2015-11-25 10:50:30 -07:00
Mike Place
d18ec83959 Merge pull request #29197 from s0undt3ch/develop
We can't import functions as we import modules
2015-11-25 10:46:44 -07:00
Mike Place
a8c917e703 Merge pull request #29195 from pzipoy/dev/pzipoy/windows_dropfile_permissions
Add windows dropfile support
2015-11-25 10:44:09 -07:00
Mike Place
89aee406fa Merge pull request #29153 from DSRCompany/features/3077_acl_limit_args
ACL limit args
2015-11-25 10:29:35 -07:00
Justin Findlay
b54de47b1b mount state: unmount by device is optional
Fixes #29140.
2015-11-25 10:25:19 -07:00
Mike Place
6a12197e13 Merge pull request #29196 from s0undt3ch/2015.8
We need novaclient imported to compare versions
2015-11-25 10:16:27 -07:00
Mike Place
063f075a99 Add integration renderer tests to the suite 2015-11-25 10:14:46 -07:00
Justin Findlay
0a8952f6ac rh_ip module: only set the mtu once
Fixes #29137.
2015-11-25 10:11:05 -07:00
Mike Place
0c0e15d4e9 Merge pull request #29059 from terminalmage/issue28072
Work around upstream pygit2 bug
2015-11-25 09:39:30 -07:00
Pedro Algarvio
f756296580 We can't import functions as we import modules 2015-11-25 16:32:31 +00:00
Mike Place
cc69c87dd2 Merge pull request #29112 from eliasp/ssh_known_hosts.present-backtrace-test
Prevent backtrace (KeyError) in `ssh_known_hosts.present` state
2015-11-25 09:25:57 -07:00