valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
49,904 Commits 24 Branches 182 Tags 341 MiB
d4c8e30f5d
Commit Graph

49904 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
6be3f8f9e1 Add support for callbacks to influence what information about commands is logged 2015-08-28 12:43:55 -05:00
Erik Johnson
c36f240a87 Add HTTPS Basic Auth funcs to salt.utils.url 2015-08-28 12:43:55 -05:00
Justin Findlay
22dbce8d61 Merge pull request #26736 from twangboy/fix_21256 
Changed import from smbconnection to smb3
 2015-08-28 11:23:42 -06:00
Colton Myers
16d4e0350d Merge pull request #26714 from jfindlay/pack_except 
add exception placeholder for older msgpacks
 2015-08-28 10:02:35 -06:00
twangboy
86f425c669 Changed import from smbconnection to smb3 2015-08-28 10:00:37 -06:00
Mike Place
47faa8cc16 Merge pull request #26710 from rallytime/gce_virtual_return 
Update GCE driver to return True, False or a new name in __virtual__()
 2015-08-27 14:08:17 -06:00
Mike Place
cf487cf0f5 Merge pull request #26709 from rallytime/fix-14612 
Ensure VM name is valid before trying to create Linode VM
 2015-08-27 14:07:49 -06:00
Justin Findlay
ebcfaf9050 add exception placeholder for older msgpacks 
Fix for #26705.
 2015-08-27 13:41:54 -06:00
Colton Myers
c3a6280f8c Merge pull request #26617 from terminalmage/issue9592 
Fix Windows failures in pip module due to raw string formatting
 2015-08-27 13:24:53 -06:00
rallytime
e6b74879d7 Remove unused import 2015-08-27 12:42:38 -06:00
rallytime
78e31585cf Update GCE driver to return True, False or a new name in __virtual__() 2015-08-27 12:04:06 -06:00
rallytime
bc21094ea0 versionadded and more efficient checks 2015-08-27 11:50:13 -06:00
Justin Findlay
24a4f54f39 Merge pull request #26700 from kev009/fbsd-disks-fix-2015.5 
Ignore the first element of kern.disks split, which is the sysctl name
 2015-08-27 11:48:02 -06:00
rallytime
a3ac8e7008 Whitespace fix 2015-08-27 11:41:14 -06:00
rallytime
9a4228d906 Added unit tests for new _validate_name function and adjusted regex 2015-08-27 11:17:28 -06:00
Mike Place
58945131b5 Merge pull request #26695 from terminalmage/better-https-auth-redaction-2015.5 
Better HTTPS basic auth redaction for 2015.5 branch
 2015-08-27 09:10:38 -06:00
Kevin Bowling
3ac97f9de4 Ignore the first element of kern.disks split, which is the sysctl name 2015-08-27 02:16:20 -07:00
Pedro Algarvio
4040a312f9 Merge pull request #26694 from terminalmage/bp-26693 
Backport #26693 to 2015.5
 2015-08-27 09:16:30 +01:00
Erik Johnson
752d260209 Use versioninfo tuple for comparison 2015-08-27 02:55:23 -05:00
Erik Johnson
b1d253483e Better HTTPS basic auth redaction for 2015.5 branch 2015-08-27 00:23:52 -05:00
serge-p
4aec926476 Update openbsdpkg.py 
* It looks like function 'pkg_resource.compare' used in orig. file is obsolete, 
* change correcting following exception, when comparing currently installed and latest available package versions: 

~~~ 
   The minion function caused an exception: Traceback (most recent call last):
      File "/usr/local/lib/python2.7/site-packages/salt/minion.py", line 1161, in _thread_return
        return_data = func(*args, **kwargs)
      File "/usr/local/lib/python2.7/site-packages/salt/modules/openbsdpkg.py", line 108, in latest_version
        if not cur or __salt__['pkg_resource.compare'](pkg1=cur,
      File "/usr/local/lib/python2.7/site-packages/salt/utils/lazy.py", line 90, in __getitem__
        raise KeyError(key)
    KeyError: 'pkg_resource.compare'
~~
 2015-08-27 00:03:15 -05:00
Erik Johnson
96c3df1ed5 Don't accept non-list input for pkgs arg 2015-08-26 21:14:49 -05:00
rallytime
388815112c Ensure VM name is valid before trying to create Linode VM 
Fixes #14612
 2015-08-26 16:41:34 -06:00
Colton Myers
0b17f80fe9 Merge pull request #26681 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-08-26 16:03:07 -06:00
Colton Myers
64cad371f0 Remove overmocked test 2015-08-26 16:02:42 -06:00
Colton Myers
40718af1d5 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    doc/conf.py
    salt/modules/win_service.py
    tests/integration/cloud/providers/digital_ocean.py
 2015-08-26 14:29:57 -06:00
Colton Myers
75675a6ba9 Merge pull request #26676 from rallytime/bp-26648 
Back-port #26648 to 2015.5
 2015-08-26 13:46:01 -06:00
Colton Myers
d7f682cb5b Merge pull request #26677 from rallytime/bp-26653 
Back-port #26653 to 2015.5
 2015-08-26 13:45:54 -06:00
Colton Myers
960dbba7ed Merge pull request #26675 from rallytime/bp-26631 
Back-port #26631 to 2015.5
 2015-08-26 13:44:59 -06:00
Damian Myerscough
497ca96039 You can provide a X-Auth-Token when requesting jobs 2015-08-26 12:30:52 -06:00
Seth House
1af42eed36 Free 'fun' from the function signature namespace 
'fun' is a common argument in Salt. format_call will choke if you
attempt to call a function that uses this argment. I.e.,:

>>> __salt__.saltutil.runner('mine.get', tgt='*', fun='network.ip_addrs', tgt_type='glob')
Traceback (most recent call last):
  File "<console>", line 1, in <module>
TypeError: runner() got multiple values for keyword argument 'fun'
 2015-08-26 12:29:25 -06:00
Pi3r
20eecdc7be Fix get_load 
The function `fetchone` always return a tuple (or None):
http://initd.org/psycopg/docs/cursor.html?highlight=fetchone#cursor.fetchone
 2015-08-26 12:28:10 -06:00
Nicole Thomas
c2c7fe06c8 Merge pull request #26667 from nmadhok/doc-fix-2014.7 
[doc-fix] Removing special character from salt.runners.pillar and other changes
 2015-08-26 12:24:37 -06:00
Nitin Madhok
26be189689 Doc fix. Fixes #26656 2015-08-26 13:08:13 -04:00
Colton Myers
db30926ac9 Merge pull request #26655 from cheng0919/2015.5 
Update win_dns_client.py
 2015-08-26 10:05:26 -06:00
Damon Zheng
fdebc01def Update win_dns_client.py 
remove trailing witespace
 2015-08-26 23:21:01 +08:00
jacobhammons
6bd3dccae8 Merge pull request #26663 from jacobhammons/2014.7-version 
version change for latest branch
 2015-08-26 08:03:35 -06:00
Jacob Hammons
b6af538070 version change for latest branch 2015-08-26 08:02:54 -06:00
jacobhammons
a04d243471 Merge pull request #26662 from jacobhammons/version 
update version to 2015.5
 2015-08-26 07:45:44 -06:00
Jacob Hammons
4e5766fdde update version to 2015.5 2015-08-26 07:45:08 -06:00
Damon Zheng
1d23d5e797 Update win_dns_client.py 
remove the + diff chars and add the TypeError exception
 2015-08-26 14:12:43 +08:00
Damon Zheng
1a45db0fb7 Update win_dns_client.py 
If there is no dns address setted in the windows client, the iface_config.DNSServerSearchOrder method will return None, therefore this module will generate TypeError,  'NoneType' object is not iterable.
 2015-08-26 09:49:39 +08:00
Justin Findlay
8a9a076ad4 Merge pull request #26651 from jfindlay/2015.5 
add 2015.5.4 notes to 2015.5.5 notes
 2015-08-25 18:25:28 -06:00
Justin Findlay
dc5cee5f8f add 2015.5.4 notes to 2015.5.5 notes 2015-08-25 16:52:13 -06:00
Colton Myers
5bdefdc234 Merge pull request #26525 from jfindlay/sum 
document check_file_meta args, remove unused arg
 2015-08-25 15:43:46 -06:00
Colton Myers
84e96458b3 Merge pull request #26561 from stanislavb/2015.5 
Leave salt.utils.s3 location fallback to salt.utils.aws
 2015-08-25 15:40:29 -06:00
Colton Myers
071a6112e5 Merge pull request #26636 from rallytime/cloud-test-fixes 
Refactor cloud provider tests to be more accurate
 2015-08-25 15:28:33 -06:00
Colton Myers
304542b4c6 Merge pull request #26640 from efficks/fixws2014 
Fix function spacing
 2015-08-25 14:01:39 -06:00
Joseph Hall
1d729734cc Merge pull request #26573 from rallytime/destroy_ssh_keys_private_ips 
Don't stacktrace if using private_ips and delete_sshkeys together
 2015-08-25 14:00:23 -06:00
Joseph Hall
000e5a2acf Merge pull request #26563 from rallytime/fix-20169 
Fix error detection when salt-cloud config is missing a master's address
 2015-08-25 14:00:11 -06:00