valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
62,575 Commits 24 Branches 182 Tags 341 MiB
603c76ec6d
Commit Graph

62575 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AsocPro
603c76ec6d Add message to the return False in virtual function 2015-12-02 18:35:14 -07:00
Mike Place
f5e24872f1 Merge pull request #29346 from adelcast/dev/adelcast/optimize_fqdn 
Minimize DNS resolution queries on grains load
 2015-12-02 16:28:13 -07:00
Alejandro del Castillo
321b37fa83 Minimize DNS resolution queries on grains load 
When grains are loaded, hostname() is called multiple times. The
hostname() function ends up calling socket.getfqdn, which is an
expensive operation if the host is not on the domain (the function times
out). Optimize grains operation to only query getfqdn once. Also , optimize
fqdn_ip4 and fqdn_ipv6 grains to only call socket.getaddrinfo (expensive
operation) if there is a domain.

Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
 2015-12-02 14:12:41 -06:00
Mike Place
2607246686 Merge pull request #29321 from techhat/sparsegenesis 
Handle sparse files
 2015-12-02 12:36:28 -07:00
Joseph Hall
4fded062d9 Merge pull request #2 from cachedout/fixup_sparsegenesis 
Fixup test for #29321
 2015-12-02 10:47:26 -07:00
Mike Place
eda0cffee5 Merge pull request #29338 from cachedout/fixup_28815 
Fixup 28815
 2015-12-02 10:47:25 -07:00
Mike Place
7b11eb0d67 Fixup test for #29321 2015-12-02 10:45:01 -07:00
Mike Place
f2bf2dff14 Adjust test for syndic config 
Refs #28115
 2015-12-02 09:35:48 -07:00
Joseph Hall
468e98a524 Lint 2015-12-02 08:41:45 -07:00
Mike Place
b96552b716 Merge pull request #29304 from sbz/monit-module-changes 
modules/monit: complete monit execution module functions
 2015-12-02 07:50:56 -07:00
Mike Place
8c0781c06f Merge pull request #29324 from s0undt3ch/features/minion-engines 
The SPM verbose flag should be in SPM defaults
 2015-12-02 07:37:24 -07:00
Mike Place
81c6b527cf Merge pull request #29325 from Granjow/typo 
Fix typo in salt.states.user.
 2015-12-02 07:36:45 -07:00
Mike Place
29ea0d0ea7 Merge pull request #29326 from Granjow/userDoc 
salt.states.user documentation: Example for generating password hash
 2015-12-02 07:36:28 -07:00
Pedro Algarvio
1bb4bb8519 More future proof fix 2015-12-02 11:12:11 +00:00
Pedro Algarvio
e4acaf5fe2 Revert "The SPM verbose flag should be in SPM defaults" 
This reverts commit 98b903a196.
 2015-12-02 11:10:54 +00:00
Simon A. Eugster
0cfb8e0c1d salt.states.user documentation: Example for generating password hash 2015-12-02 11:01:53 +01:00
Simon A. Eugster
9224488a43 Fix typo in salt.states.user. 2015-12-02 10:57:00 +01:00
Pedro Algarvio
98b903a196 The SPM verbose flag should be in SPM defaults 2015-12-02 09:40:41 +00:00
Pedro Algarvio
1b8df81046 Merge pull request #29320 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-12-02 08:47:19 +00:00
Joseph Hall
d513727cb6 Handle sparse files 2015-12-01 18:51:35 -07:00
Colton Myers
2b99aab501 Lint fixes 2015-12-01 17:31:59 -07:00
Colton Myers
3f09d58fff Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/modules/rh_ip.py
    salt/modules/s3.py
    salt/modules/saltutil.py
    salt/modules/zypper.py
    salt/spm/__init__.py
    salt/utils/aws.py
    salt/utils/s3.py
    tests/unit/modules/s3_test.py
    tests/unit/pydsl_test.py
 2015-12-01 15:31:03 -07:00
Colton Myers
a3a463ff8b Merge pull request #29317 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-12-01 14:28:30 -07:00
Justin Findlay
60bd5781ef Merge pull request #29312 from sjmh/fix/etcd_watch_valerr 
Catch ValueError on timeout on non-existing key
 2015-12-01 13:55:41 -07:00
Sofian Brabez
a2e5586cd4 modules/monit: alias reload function also and fix lint issues 2015-12-01 21:42:56 +01:00
Colton Myers
0d90dd3a19 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    debian/salt-master.service
    salt/modules/win_pkg.py
 2015-12-01 13:26:44 -07:00
Colton Myers
14e94b3593 Merge pull request #29316 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-12-01 13:20:23 -07:00
Colton Myers
33f40b3c47 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-12-01 13:19:39 -07:00
Steve Hajducko
cef6eff7c8 Catch ValueError on timeout on non-existing key 
The etcd watch function tries to read a key when it reaches the timeout
in order to obtain details about the key.

On python 2.6, when it tries to re-read the key, it throws a ValueError,
since python-etcd doesn't officially support python 2.6.  The watch
function wasn't catching this ValueError, so it was returning the
exception, rather than a blank dict.
 2015-12-01 10:30:45 -08:00
Mike Place
a890307cc0 Merge pull request #29310 from cachedout/fixup_spmverbose 
Fixup spmverbose
 2015-12-01 11:28:07 -07:00
Mike Place
cdde617be3 Fixup test for spm verbose PR 
Refs #29274
 2015-12-01 11:27:03 -07:00
Sofian Brabez
0d2df70008 modules/monit: alias id function 2015-12-01 19:12:25 +01:00
Sofian Brabez
e522341d3b modules/monit: avoid kwargs argument in execution module 2015-12-01 19:05:05 +01:00
Mike Place
39667fda12 Merge pull request #29240 from clan/linux_acl 
handle acl_type [[d]efault:][user|group|mask|other]
 2015-12-01 10:56:20 -07:00
Mike Place
027bed7c90 Merge pull request #29305 from lorengordon/source_hash_protos 
Add 'file' as a source_hash proto
 2015-12-01 10:39:37 -07:00
Mike Place
7e424e10f2 Merge pull request #28054 from dr4Ke/custom_grains_deep_merge 
loader uses a deep dictionary merge for the grains (core and customs)
 2015-12-01 10:33:52 -07:00
Loren Gordon
53fdf0bf97 Update message for invalid source_hash 2015-12-01 11:59:12 -05:00
Loren Gordon
2d20d71bd5 Add file as a source_hash proto 2015-12-01 11:43:47 -05:00
Mike Place
f6d23d8aa2 Merge pull request #29245 from s0undt3ch/features/minion-engines 
Engines support on Minions!
 2015-12-01 09:35:33 -07:00
Sofian Brabez
539fd52220 modules/monit: complete monit execution module functions 
add new functions configtest(), id(), reload(), version() and validate()
to the monit execution module
 2015-12-01 17:33:52 +01:00
Mike Place
1129ee1d2e Merge pull request #29272 from jfindlay/win_up_time 
win_status module: handle 12 hour time in uptime
 2015-12-01 09:33:12 -07:00
Mike Place
0fd3e8b0fb Merge pull request #29289 from terminalmage/issue26526 
file.managed: Allow local file sources to use source_hash
 2015-12-01 09:19:27 -07:00
Mike Place
7ec486655f Merge pull request #29303 from cachedout/reorder_archive_extract_args 
Reorder arg to end
 2015-12-01 09:16:59 -07:00
Mike Place
b95f5af2f2 Reorder arg to end. 
Refs #29292
 2015-12-01 09:16:32 -07:00
Mike Place
bcc3438638 Merge pull request #29292 from magnusboman/archive_extract 
Add ability to extract archive if hash has changed
 2015-12-01 09:12:51 -07:00
Mike Place
d2fb2109a3 Merge pull request #29296 from douardda/patch-3 
Use process KillMode on Debian systems also
 2015-12-01 09:00:16 -07:00
David Douard
d2885390f4 Use process KillMode on Debian systems also 
closes #29295
 2015-12-01 11:16:06 +01:00
Z. Liu
02429aca69 handle acl_type [[d]efault:][user|group|mask|other] 2015-12-01 14:55:08 +08:00
Magnus Boman
3b27f4e212 Fix indentation 2015-12-01 11:23:30 +11:00
Pedro Algarvio
33844c3cbd Lower log levels 2015-12-01 00:16:44 +00:00