valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
31,363 Commits 24 Branches 182 Tags 341 MiB
023e0bc77d
Commit Graph

31363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
023e0bc77d Merge pull request #13211 from lyft/boto-elb-update-route53 
Let boto_elb manage cnames via route53
 2014-06-04 14:22:53 -06:00
Thomas S Hatch
5bf12eb7af Merge pull request #13204 from rallytime/pylints 
Remove shadowed id kwarg and make valid and invalid functions private
 2014-06-04 14:22:15 -06:00
Thomas S Hatch
23d1454c91 Merge pull request #13203 from cachedout/12296 
Strip BOM in minion ids
 2014-06-04 14:21:10 -06:00
Mike Place
41f7859413 Merge pull request #13237 from deuscapturus/develop 
Update sentry_mod.py
 2014-06-04 13:59:00 -06:00
deuscapturus
ba225603a6 Update sentry_mod.py 
Pass DSN to raven client. fix for issue 13172. Thanks cachedout
 2014-06-04 13:52:46 -06:00
Mike Place
c912a38e28 Merge pull request #13234 from jacksontj/develop 
Fix for #13008
 2014-06-04 13:30:52 -06:00
Thomas Jackson
3886ba10ee Fix for #13008 
This is a somewhat silly fix since everywhere that calls "save_load" does something like:

```
save_load(load['jid'], load)
```
 2014-06-04 12:07:42 -07:00
Mike Place
63117e4e26 Merge pull request #13229 from cvrebert/patch-1 
salt/modules/file.py: rm trailing whitespace
 2014-06-04 13:00:39 -06:00
Mike Place
8202ab910d Merge pull request #13230 from cvrebert/patch-2 
modules.varnish.purge(): avoid shadowing
 2014-06-04 11:42:47 -06:00
Chris Rebert
9c326a3e16 modules.varnish.purge(): avoid shadowing 
************* Module salt.modules.varnish
salt/modules/varnish.py:74: [W0621(redefined-outer-name), purge] Redefining name 'purge' from outer scope (line 61)
 2014-06-04 10:16:45 -07:00
Chris Rebert
9290d384d0 salt/modules/file.py: rm trailing whitespace 
************* Module salt.modules.file
salt/modules/file.py:953: [C0303(trailing-whitespace), ] Trailing whitespace
 2014-06-04 10:10:34 -07:00
Mike Place
0e00a013c5 Merge pull request #13228 from cvrebert/patch-1 
salt/client/raet/__init__.py: fix spacing per pylint
 2014-06-04 11:08:49 -06:00
Chris Rebert
71b07a084e salt/client/raet/__init__.py: fix spacing per pylint 
************* Module salt.client.raet.__init__
salt/client/raet/__init__.py:56: [C0326(bad-whitespace), ] No space allowed around keyword argument assignment
                name = 'client' + yid,
 2014-06-04 10:07:27 -07:00
Colton Myers
4ae72f9b43 Merge pull request #13223 from zaide/develop 
[Issue #13072] Change PCRE reference to Python's re() in the documentati...
 2014-06-04 10:00:49 -06:00
Damien DESMARETS
ba22d45c99 [Issue #13072] Change PCRE reference to Python's re() in the documentation. 2014-06-04 15:10:16 +02:00
Joseph Hall
af6dd62de4 Merge pull request #13220 from s0undt3ch/hotfix/lint 
String formatting should be Py2.6 compatible. Fixes #13218.
 2014-06-04 05:30:21 -06:00
Pedro Algarvio
0810a85d56 String formatting should be Py2.6 compatible. Fixes #13218. 2014-06-04 11:39:10 +01:00
Colton Myers
5533838440 Merge pull request #13210 from cachedout/11326 
Changes in default auth settings
 2014-06-03 16:17:18 -06:00
Thomas S Hatch
1c137f49cb Merge pull request #13208 from cachedout/total_seconds_util 
A port of #13200 into develop
 2014-06-03 16:15:35 -06:00
Ryan Lane
471c2f5fe6 Followup for route53 in boto_elb 2014-06-03 14:34:36 -07:00
Ryan Lane
267175a228 Let boto_elb manage cnames via route53 2014-06-03 14:24:42 -07:00
Mike Place
30651a13f0 Pylint 2014-06-03 14:41:02 -06:00
Mike Place
d4972fa818 Changes in default auth settings 
Per @whiteing in #11781 and @UtahDave, these options should be
set as default to provide minion re-auth flooding.

Closes #11326.
 2014-06-03 14:32:19 -06:00
Samuel Smith
efd1a9a97d Merge pull request #13209 from SmithSamuelM/sam_raet_41 
Added support for RAET v0.0.15
 2014-06-03 14:19:06 -06:00
Mike Place
9988f86323 A port of #13200 into develop 
Thanks to @jhenry82 for the good work here. This just ensures his
work is present in the develop branch as well.
 2014-06-03 14:16:28 -06:00
Samuel M Smith
1608ed6475 Merge remote-tracking branch 'upstream/develop' into sam_raet_41 2014-06-03 14:10:24 -06:00
Samuel M Smith
53c5a38f86 Support for raet v0.0.15 2014-06-03 14:08:13 -06:00
rallytime
a734a57cda pylint fixes 2014-06-03 13:57:49 -06:00
Joseph Hall
ea4b1e9a99 Merge pull request #13205 from jaloren/develop 
in openstack topic, appended tokes the auth url which the driver require...
 2014-06-03 13:18:52 -06:00
Joseph Lorenzini
e13b2e3dc3 in openstack topic, appended tokes the auth url which the driver requires. Auth failure occurs without it. 2014-06-03 14:02:09 -05:00
Mike Place
7e115261e5 Remove chadet dep. Not needed. 2014-06-03 12:55:17 -06:00
Mike Place
34ecb079a6 Don't convert, just remove BOM 2014-06-03 12:54:33 -06:00
Thomas S Hatch
0209ad085b Set period for the sheduler on the master in raet to 60 2014-06-03 12:38:58 -06:00
Thomas S Hatch
bffe2c80cb change virtual module reloading to trace 2014-06-03 12:38:07 -06:00
rallytime
4b832d3a8b Remove shadowed id kwarg and make valid and invalid functions private 2014-06-03 12:18:40 -06:00
Mike Place
b2cf293ee4 Strip out BOM in minion IDs. 
Closes #12296
 2014-06-03 12:05:09 -06:00
Thomas S Hatch
aad9140cf8 Merge pull request #13196 from terminalmage/docs 
Clarify installation of GitPython
 2014-06-03 11:09:37 -06:00
Thomas S Hatch
3a818d6726 Merge pull request #13194 from olliewalsh/fix_12370 
Fix issue #12370
 2014-06-03 11:08:27 -06:00
Thomas S Hatch
35c0ca32e6 Merge pull request #13186 from lyft/fix-route53-docs 
Fix docs for boto_route53 type -> record_type
 2014-06-03 11:06:39 -06:00
Thomas S Hatch
b4ee80ef0e Merge pull request #13183 from lyft/return_elb_dns 
Return DNS information from boto_elb.get_elb_config
 2014-06-03 11:06:19 -06:00
Thomas S Hatch
b86aa9b6b0 Merge pull request #13176 from cachedout/12611 
Support Unicode in grains output.
 2014-06-03 11:03:04 -06:00
Thomas S Hatch
ede8030f0b Merge pull request #13175 from nicksloan/absolute_known_hosts 
Documented absolute path changes to ssh_known_hosts.
 2014-06-03 11:02:15 -06:00
Thomas S Hatch
b66e22fab8 Add logging line to varnish execution module 2014-06-03 11:01:08 -06:00
Thomas S Hatch
4979ae7b1d Merge pull request #13167 from terminalmage/varnish-cleanup 
Cleanup new varnish module and add to docs
 2014-06-03 11:00:03 -06:00
Erik Johnson
ed65fac906 Add link to new section on how to install GitPython 2014-06-03 10:41:06 -05:00
Erik Johnson
dcaf2892f3 Clarify GitPython installation in gitfs tutorial 2014-06-03 10:40:27 -05:00
Ollie Walsh
f5acc16e9a Do not send reload modules event to minion loop when multithreaded. 2014-06-03 15:48:24 +01:00
Joseph Hall
61e05c0f4b Merge pull request #13193 from shift/develop 
Documentation fixes
 2014-06-03 08:34:53 -06:00
Vincent Palmer
61bf0b7a98 Documentation fix in salt/states/postgres_database.py 
Small typo fix in the documentation.
 2014-06-03 16:24:26 +02:00
Vincent Palmer
36cb2465a8 Updated etcd_mod.py 
Fixed documentation syntax for bash multiline examples.
 2014-06-03 15:50:52 +02:00