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,334 Commits 24 Branches 182 Tags 341 MiB
28b40de8da
Commit Graph

62334 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
28b40de8da Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/__init__.py
    salt/client/ssh/ssh_py_shim.py
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/vmware.py
    salt/grains/philips_hue.py
    salt/modules/boto_ec2.py
    salt/modules/boto_route53.py
    salt/modules/dracr.py
    salt/modules/philips_hue.py
    salt/proxy/philips_hue.py
    salt/states/virtualenv_mod.py
 2015-11-24 16:07:31 -07:00
Colton Myers
2fb1ca0eac Merge pull request #29167 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-11-24 14:40:34 -07:00
Colton Myers
525f9fbbbb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-11-24 14:39:48 -07:00
Justin Findlay
a26c10a811 Merge pull request #29164 from jfindlay/bp-29113 
Backport #29113
 2015-11-24 14:26:17 -07:00
Mark McGuire
50fab35188 kill unneeded import 2015-11-24 13:28:31 -07:00
Mike Place
68d6c454b8 Merge pull request #29141 from optix2000/full_sls_import 
Add test case for require: sls with only import statements
 2015-11-24 09:17:57 -07:00
Mike Place
3326991479 Merge pull request #29027 from makearl/issue-28796-beacon-config-as-list 
Fix issue 28796 beacon config as list
 2015-11-24 09:06:45 -07:00
Mike Place
732f5364a2 Merge pull request #29072 from terminalmage/issue28311 
Several gitfs/git_pillar fixes
 2015-11-24 09:04:39 -07:00
Mike Place
95689ee1a4 Merge pull request #29118 from ticosax/dockerng-network 
[dockerng] Add networking capabilities
 2015-11-24 08:47:36 -07:00
Mike Place
4b4f212d2d Merge pull request #29145 from alprs/fix-duplicate_import 
Remove duplicate import of salt.utils.s3
 2015-11-24 08:36:05 -07:00
Mike Place
8ddbfd018b Merge pull request #29136 from cachedout/handle_slack_outage 
Handle condition where Slack API may be unstable
 2015-11-24 08:34:35 -07:00
Mike Place
6079569580 Merge pull request #29148 from lomeroe/boto_route53_create_zone_fix-backport 
correcting parameter calls to boto get_zone/create_zone functions in …
 2015-11-24 08:33:53 -07:00
Mike Place
efdc3cc088 Merge pull request #29149 from lomeroe/boto_route53_create_zone_fix 
Boto route53 create zone fix
 2015-11-24 08:29:46 -07:00
Mike Place
1bb698d4ab Merge pull request #29150 from sjorge/docs-state-smartos 
minor doc tweaks for salt.states.smartos
 2015-11-24 08:23:49 -07:00
Nicolas Delaby
e98d18ba41 Expose docker networking as state 2015-11-24 13:55:22 +01:00
Nicolas Delaby
94135d91c3 cosmetic 2015-11-24 13:55:22 +01:00
Nicolas Delaby
17ff5c1ab5 Add expose networking to modules.dockerng 2015-11-24 13:55:22 +01:00
Jorge Schrauwen
8557c9ec42 minor doc tweaks for salt.states.smartos 2015-11-24 12:45:13 +00:00
Ethan Moore
75408ccf99 correcting parameter calls to boto get_zone/create_zone functions in create_zone 
parameter check on create_zone on private_zone=True
add boto version requirement
 2015-11-24 11:54:42 +00:00
Andreas Lutro
e1101bea19 Remove duplicate import of salt.utils.s3 
Closes #29144
 2015-11-24 09:45:31 +01:00
Weilu Jia
596843e8d6 Add test case for sls with only import 
Tests https://github.com/saltstack/salt/issues/10852
 2015-11-23 18:27:56 -08:00
Justin Findlay
4f03196e7d Merge pull request #29138 from jfindlay/2015.5 
add 2015.5.8 release notes
 2015-11-23 16:22:48 -07:00
Justin Findlay
be045f5cb1 add 2015.5.8 release notes 2015-11-23 16:21:45 -07:00
Mike Place
3ac70a4a8b Align with test 2015-11-23 14:57:51 -07:00
Mike Place
5e659f1b15 Handle condition where Slack API may be unstable 
Return simple error message and set result to false
 2015-11-23 13:57:06 -07:00
Erik Johnson
dae738fda3 Use common code to detect envs 
This commit adds a parent-class function which makes the calculation of
environment names identical regardless of the provider being used. The
function simply accepts a list of the ref paths (i.e. refs/heads/foo,
refs/remotes/origin/bar, refs/tags/baz).

This commit also makes a slight tweak to how dulwich determines which
ref paths to use for env detection. Before it used any ref with a path
beginning with refs/heads or refs/tags, but this switches it to
refs/remotes so that the common logic introduced in the new function
described above works.

It seems that dulwich adds local heads for any remote heads pulled down
when the remote is fetched, which is why this would have worked for env
detection before.

This commit contains a more complete fix for #27432, as an earlier
commit only fixed this for pygit2.
 2015-11-23 14:23:39 -06:00
Mike Place
e360d70e8c Merge pull request #29129 from TronPaul/configparser-fix-docs 
fix configparser docs
 2015-11-23 13:08:37 -07:00
Ethan Moore
fefb1abec4 correct if checkon vpc_id and vpc_region 2015-11-23 19:38:52 +00:00
Ethan Moore
cd63dc4dc1 Add check to require vpc_id and vpc_region for private zones 
Add parameter documentation for create_zone function
 2015-11-23 19:35:11 +00:00
Erik Johnson
a9c0cacb77 Don't add head ref if head red matches desired ref 2015-11-23 13:24:37 -06:00
Erik Johnson
e7540e956b pygit2: Don't clean local heads along with stale remote refs 
Also, set the 'credentials' attribute for the GitProvider subclass to
None by default, so that it is always present, and only non-none when
there is valid authentication configured.
 2015-11-23 13:20:19 -06:00
Thomas S Hatch
17638c734b Merge pull request #29108 from lorengordon/type-enforce-length 
Enforce length as an int, fixes #29107
 2015-11-23 12:06:52 -07:00
Mike Place
2dc5347994 Merge pull request #29134 from cachedout/exception_handling_compat 
Broader exception handling in compt
 2015-11-23 12:01:51 -07:00
Colton Myers
233ab8a474 Merge pull request #29125 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-11-23 11:48:46 -07:00
Mike Place
ee623c5de4 Broader exception handling in compt 
When modules cannot be imported, such as in cases wherein there is a version incompatability between Python versions, sometimes those modules will raise errors other than ImportError. This accounts for that.

Fixes a broken test on develop: integration.cli.custom_module.SSHCustomModuleTest.test_ssh_sls_with_custom_module
 2015-11-23 11:35:24 -07:00
Mike Place
dc0d47fa2e Merge pull request #29126 from fcrozat/2015.8 
Fix deployment when umask is non-standard
 2015-11-23 10:53:46 -07:00
Mike Place
994d8bd71a Merge pull request #29124 from rallytime/bp-28130 
Back-port #28130 to 2015.8
 2015-11-23 10:31:00 -07:00
Mark McGuire
c40b7ea524 fix configparser docs 2015-11-23 11:30:05 -06:00
Mike Place
902843b52c Merge pull request #29127 from sjorge/state-schedule-docs 
very minor doc fix for salt.states.schedule
 2015-11-23 10:29:28 -07:00
Colton Myers
1432cc806d Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-11-23 10:08:57 -07:00
Colton Myers
219367a23d Merge pull request #29128 from cachedout/tweak_29122 
Set a safer default value for ret in saltmod
 2015-11-23 10:07:40 -07:00
Mike Place
b08858b040 Missed check 2015-11-23 10:07:21 -07:00
Mike Place
584efe81ee Set a safer default value for ret in saltmod 
Tweak fix in #29122 after review with @basepi
 2015-11-23 10:04:34 -07:00
Jorge Schrauwen
6fb2a05de4 very minor doc fix 2015-11-23 17:02:39 +00:00
Frederic Crozat
4da11a5f3c Fix deployment when umask is non-standard. Fixes #29005 2015-11-23 17:58:41 +01:00
Frederic Crozat
bbccb752f9 Fix deployment when umask is non-standard. Fixes #28830 2015-11-23 17:55:48 +01:00
Colton Myers
8d86bc3056 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/states/rabbitmq_user.py
    salt/states/user.py
 2015-11-23 09:53:11 -07:00
rallytime
e290ea4a3f Pylint Fix 2015-11-23 09:34:03 -07:00
Nicole Thomas
2250a36647 Merge pull request #29122 from cachedout/issue_29110 
Fix broken state orchestration
 2015-11-23 09:24:18 -07:00
Mike Place
d9c32011b4 Merge pull request #29076 from RealKelsar/2015.8 
We can't query installed use flags for a non installed pkg
 2015-11-23 09:19:40 -07:00