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
50,082 Commits 24 Branches 182 Tags 341 MiB
bc90c5bffe
Commit Graph

50082 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eren Güven
bc90c5bffe improve change reporting for postgres_user groups 2015-10-08 12:14:24 +02:00
Eren Güven
8712bce91a backport postgres_user groups 2015-10-08 11:34:54 +02:00
Colton Myers
b2937b6a16 Merge pull request #27759 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-10-07 12:01:54 -06:00
Colton Myers
792ee084bb Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-10-07 12:00:53 -06:00
Justin Findlay
4b9128b491 Merge pull request #27732 from jacobhammons/26673 
update docs for __virtual__ and __virtualname__
 2015-10-07 11:29:31 -06:00
Nicole Thomas
a130896d1c Merge pull request #27747 from Sacro/fix-chocolatey-version 
Chocolatey doesn't have a help command.
 2015-10-07 10:06:53 -06:00
Jacob Hammons
75cc07cf10 noted that __virtual__ can return False and an error string 2015-10-07 09:48:46 -06:00
Ben Woodward
8f1fa9e78e Chocolatey doesn't have a help command. 2015-10-07 13:44:51 +01:00
jacobhammons
4e48651de0 Merge pull request #27733 from jacobhammons/bug-fixes 
hardening topic - updates to docs.saltstack.com theme
 2015-10-06 19:44:00 -06:00
Jacob Hammons
cbecd4f553 Updated saltstack2 theme to add SaltConf16 banner 2015-10-06 17:38:49 -06:00
Jacob Hammons
117e0c2bcc Added hardening topic based on the information in Refs #27088 2015-10-06 17:36:54 -06:00
Jacob Hammons
b928e1afa8 update docs for __virtual__ and __virtualname__ 
Refs #26673
 2015-10-06 17:23:42 -06:00
Nicole Thomas
c58da846bf Merge pull request #27706 from jacobhammons/bug-fixes 
Assorted doc bugs
 2015-10-05 23:35:29 -06:00
Jacob Hammons
76dc8de71b Assorted doc bugs 
Refs #9051
Refs #13407
Refs #21475
Refs #14876
Refs #27005
 2015-10-05 17:37:13 -06:00
Colton Myers
43fba89865 Merge pull request #27695 from rallytime/bp-27671 
Back-port #27671 to 2015.5
 2015-10-05 15:57:36 -06:00
Colton Myers
cb3d92676e Merge pull request #27524 from jfindlay/pkgng_quiet 
parse pkgng output in quiet mode for >= 1.6.1
 2015-10-05 15:22:40 -06:00
Colton Myers
5b88c55cc3 Merge pull request #27686 from rallytime/bp-27476 
Back-port #27476 to 2015.5
 2015-10-05 15:17:59 -06:00
Colton Myers
f9ddd4647f Merge pull request #27684 from rallytime/bp-27656 
Back-port #27656 to 2015.5
 2015-10-05 15:17:55 -06:00
Colton Myers
7ca6f854ff Merge pull request #27683 from rallytime/bp-27659 
Back-port #27659 to 2015.5
 2015-10-05 15:17:30 -06:00
Colton Myers
a0f3e34656 Merge pull request #27682 from rallytime/bp-27566 
Back-port #27566 to 2015.5
 2015-10-05 15:17:26 -06:00
Colton Myers
0b9ba911c4 Merge pull request #27681 from rallytime/bp-25928 
Back-port #25928 to 2015.5
 2015-10-05 15:17:19 -06:00
Colton Myers
23da0d316a Merge pull request #27680 from rallytime/bp-27535 
Back-port #27535 to 2015.5
 2015-10-05 15:17:10 -06:00
Oleg Gashev
2a88028595 Added skip test_ext_pillar_env_mapping if git module does not exist. 
If module named git does not exist, test test_ext_pillar_env_mapping
fail:

======================================================================
ERROR: test_ext_pillar_env_mapping
(integration.modules.pillar.PillarModuleTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/opt/git/salt/tests/integration/modules/pillar.py", line 120, in
test_ext_pillar_env_mapping
    import git
ImportError: No module named git

Added skip test_ext_pillar_env_mapping test.
 2015-10-05 14:47:25 -06:00
Nicole Thomas
d284eb165b Merge pull request #27390 from JaseFace/schedule-missing-enabled 
Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item()
 2015-10-05 12:09:33 -06:00
Nicole Thomas
7d7b97eab6 Merge pull request #27442 from JaseFace/fix-27391-for-2015.5 
Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item()
 2015-10-05 12:01:29 -06:00
Dennis Harper
3e08d3de8a fix for: https://github.com/saltstack/salt/issues/27373 
Setup::DownloadWindowsDlls is downloading and writing the file as
a text not a binary file.

When creating the file handle to write the binary after being download from salt's
dependency repo, the file handle was being created with just the 'write' attribute,
however it also needs the 'binary' attribute.

Change-Id: I2f67d27ee847cd7808a78cd5ec0b2151d6a0c0e7
 2015-10-05 11:51:29 -06:00
Georges Racinet
d3780cba00 Fix #27655: handling of success in postgres_local_cache 
- using get() is anyway more pythonic
- psycopg2 translates None to NULL
- moving explanation to schema comment

(there's no existing unit test for this)
 2015-10-05 11:43:56 -06:00
Gary Wright
84b6ee0c58 .pub as public key is what we should send to remote 2015-10-05 11:40:55 -06:00
Daniel Hahler
2a44255748 minor: fix/format doc for returners.local_cache.prep_jid 2015-10-05 11:39:08 -06:00
Daniel Hahler
fd485e2396 returners.local_cache: fix endless loop on OSError 
I was getting a "Permission denied" OSError when running as a non-root
user, from the example provided at
https://docs.saltstack.com/en/latest/ref/runners/all/salt.runners.pillar.html#salt.runners.pillar.show_pillar:

    import salt.config
    import salt.runner
    opts = salt.config.master_config('/etc/salt/master')
    runner = salt.runner.RunnerClient(opts)
    pillar = runner.cmd('pillar.show_pillar')
    print(pillar)

This patch passes on the increased `recurse_count` argument, so it will
eventually abort after 5 retries.
 2015-10-05 11:39:08 -06:00
Mike Place
17e1ddf137 Fix stacktrace for non-existant states 
Closes #25813
 2015-10-05 11:30:36 -06:00
rallytime
04aed5e105 Versionadded change since 2015.5.6 has already been tagged 2015-10-05 11:17:49 -06:00
Julien Cigar
579f2646ba .. versionadded:: 2015.5.6 2015-10-05 11:16:59 -06:00
Julien Cigar
cbaf46e066 python <2.7 compability (pylint issue) 2015-10-05 11:16:59 -06:00
Julien Cigar
ecde499478 s/bin/b to avoid confusion with bin() 2015-10-05 11:16:59 -06:00
Julien Cigar
4237c5db80 add a __virtual__ to check that daemontools is installed properly 2015-10-05 11:16:58 -06:00
Julien Cigar
623935a1bc fix doc 2015-10-05 11:16:58 -06:00
Julien Cigar
573de3abd6 fix pylint issue 2015-10-05 11:16:58 -06:00
Julien Cigar
5eb6a30d40 fix pep8 issues 2015-10-05 11:16:58 -06:00
Julien Cigar
298cf4f5c0 import missing logging module 2015-10-05 11:16:58 -06:00
Julien Cigar
fe0ad36609 log was missing 2015-10-05 11:16:58 -06:00
Julien Cigar
e457083465 s/systemd/FreeBSD 2015-10-05 11:16:58 -06:00
Julien Cigar
3512712e89 forgot service name.. 2015-10-05 11:16:58 -06:00
Julien Cigar
8f193a7bcc fixes #27505 2015-10-05 11:16:58 -06:00
C. R. Oldham
ccbba8656b Merge pull request #27641 from rallytime/gate-psutil-diskusage 
Gate the psutil import and add depends doc for diskusage beacon
 2015-10-05 11:00:47 -06:00
Nicole Thomas
09183994f9 Merge pull request #27644 from rallytime/bp-27640 
Back-port #27640 to 2015.5
 2015-10-05 08:55:31 -06:00
Stephen Medina
a9063a9745 fix typo in default pillar path 
I am a newb and this threw me off for a bit. Wanted to make it consistent with the rest of the doc.
 2015-10-02 16:50:28 -06:00
rallytime
da2d93a3dd Gate the psutil import and add depends doc for diskusage beacon 
Refs #26320
 2015-10-02 15:59:16 -06:00
Mike Place
27fcecccbe Merge pull request #27612 from rallytime/fix-27609 
Fix GCE external_ip stacktraces in 2015.5
 2015-10-02 09:42:20 -06:00
rallytime
8dc047dc18 If external_up is set to None, don't stacktrace, just use the private ip. 2015-10-01 16:37:17 -06:00