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
59,981 Commits 24 Branches 182 Tags 341 MiB
9128e8e7ae
Commit Graph

59981 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
8296fefb31 Merge #27448 with test fixes 2015-10-05 12:33:03 -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
Nicole Thomas
58cd9325ce Merge pull request #27476 from belvedere-trading/27373 
fix for: https://github.com/saltstack/salt/issues/27373
 2015-10-05 11:51:06 -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
Nicole Thomas
f42482e2b8 Merge pull request #27656 from gracinet/27655-pg-local-cache-success 
Fix #27655: handling of success in postgres_local_cache
 2015-10-05 11:43:35 -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
Nicole Thomas
31b3fd74c8 Merge pull request #27566 from blueyed/fix-local-returners-recurse_count 
returners.local_cache: fix endless loop on OSError
 2015-10-05 11:38:33 -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
Tom Williams
801d796185 Add ".. versionadded:: Boron" to new functions, general doc string cleanup. 2015-10-05 13:13:31 -04:00
Nicole Thomas
41e8694288 Merge pull request #27535 from silenius/issue_27505 
Issue 27505
 2015-10-05 11:13:26 -06:00
Nicole Thomas
c70a576fe8 Merge pull request #27659 from gnubyexample/develop 
.pub as public key is what we should send to remote
 2015-10-05 11:08:20 -06:00
Nicole Thomas
4d7be3f972 Merge pull request #27651 from eliasp/2015.8-cloud.clouds.ec2-check-for-subnetId-before-using-it 
Check for existence of 'subnetId' key in subnet dict
 2015-10-05 11:01:33 -06:00
C. R. Oldham
d9266505a7 Merge pull request #27639 from rallytime/fix-23370 
Docement version added for new artifactory options
 2015-10-05 11:01:21 -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
C. R. Oldham
737757f2db Merge pull request #27642 from rallytime/pkg-beacon-version 
Add versionadded to pkg beacon
 2015-10-05 11:00:29 -06:00
Nicole Thomas
6aa7637cd1 Merge pull request #27650 from tkwilliams/d.boto_secgroup.absent.return.status 
Fixed return status of boto_secgroup.absent()
 2015-10-05 10:44:50 -06:00
Nicole Thomas
771e5136f1 Merge pull request #27677 from rallytime/bp-27675 
Back-port #27675 to 2015.8
 2015-10-05 09:47:34 -06:00
avinassh
bfa0acfbfe Fix a typo 2015-10-05 08:58:51 -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
Nicole Thomas
6bc5ddc561 Merge pull request #27637 from rallytime/bp-27604 
Back-port #27604 to 2015.8
 2015-10-05 08:54:59 -06:00
Nicole Thomas
40f6cd8064 Merge pull request #27675 from avinassh/patch-1 
Fix a typo
 2015-10-05 08:50:44 -06:00
avinassh
e265ba8592 Fix a typo 2015-10-05 19:21:16 +05:30
Oleg Gashev
4e2d21ac68 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 12:49:06 +00:00
Gareth J. Greenaway
ded1521968 Adding the ability for the inotify beacon to exclude certain sub directories or files withing a watched location. 2015-10-04 20:00:51 -07:00
Joseph Hall
6415cafc59 Merge pull request #27666 from mbrukman/google-compute-engine-os 
[google] add missing public image projects
 2015-10-04 20:02:13 -06:00
Misha Brukman
b04aea0d1f [google] add missing public image projects 
This adds all other public image projects supported by the `gcloud` tool from
Google Cloud SDK to be automatically supported by Salt. The list of such images
are listed here: https://cloud.google.com/compute/docs/operating-systems/ and
can be found via `gcloud compute images list`.
 2015-10-04 17:12:23 -04:00
Nicole Thomas
905acc6229 Merge pull request #27657 from garethgreenaway/19291_pkg_state_latest_fix 
Fix to pkg state module
 2015-10-03 17:56:02 -06:00
Gary Wright
00baf21176 .pub as public key is what we should send to remote 2015-10-03 23:01:19 +01:00
Gareth J. Greenaway
c950527b24 When latest is passed in the state as the version to install, once the package is installed the state runs will fail. pkg.latest_version returned an empty string once the package is installed so we need to grab the installed version in that case to avoid passing an empty string to the pkg module in question. 2015-10-03 10:07:54 -07:00
Georges Racinet
0b7536f959 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-03 17:03:57 +02:00
Elias Probst
f21a763809
Check for existence of 'subnetId' key in subnet dict 2015-10-03 14:01:42 +02:00
Tom Williams
eed44339ad Fixed return status of boto_secgroup.absent() on non-existence to match semantics of other modules and functions 2015-10-03 03:22:20 -04:00
Tom Williams
766fa086df The last of the pylint complaints I hope... 2015-10-03 02:38:27 -04:00