valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
31,383 Commits 24 Branches 182 Tags 341 MiB
59efc05d40
Commit Graph

31383 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Samuel M Smith
59efc05d40 Merge remote-tracking branch 'upstream/develop' into sam_raet_42 2014-06-05 09:42:20 -06:00
Samuel M Smith
691f000fe1 Changed Rx and Tx behaviors to ServiceAllRx and ServiceAllTx from ServiceAll to reduce unnecessary 
queue checks
 2014-06-05 09:40:27 -06:00
Pedro Algarvio
ca9a5be2da Merge pull request #13253 from IllegalWalker/fix-timeout-bug 
Add unicode supportting for client timeout arg.
 2014-06-05 16:33:37 +01:00
泓远
5977e901e4 Add unicode supportting for client timeout arg. 
Salt-API passed unicode timeout arg to salt.client.LocalClient(),
causing timeout arg passed being invalid. This will fix it.
 2014-06-05 23:13:18 +08:00
Joseph Hall
2bf807ff3d Merge pull request #13244 from gtmanfred/develop 
fixes #13243
 2014-06-05 05:52:01 -06:00
Pedro Algarvio
afc446fded Merge pull request #13245 from gtmanfred/pylint 
fix pylint for sentry_mod
 2014-06-05 10:06:50 +01:00
Pedro Algarvio
75d047580c Merge pull request #13221 from s0undt3ch/hotfix/lint 
Fix lint issues
 2014-06-05 09:09:06 +01:00
Pedro Algarvio
9c618dd477 String formatting should be Py2.6 compatible(missed one). Refs #13218. 2014-06-05 09:06:50 +01:00
Seth House
595e51f7b1 Merge pull request #13246 from whiteinge/doc-xetex-unicode-pdf 
Added entry to docs Makefile and Sphinx config to build PDF usinx XeTeX
 2014-06-04 19:50:25 -06:00
Seth House
63dc40bd06 Added entry to docs Makefile and Sphinx config to build PDF usinx XeTeX 
We have a few unicode chars in the docs now. Plus this should be a good
change for future non-English builds of the docs.
 2014-06-04 17:44:10 -06:00
Daniel Wallace
d9a8214943 fixes #13243 2014-06-04 18:34:12 -05:00
Daniel Wallace
edeec50a38 fix pylint for sentry_mod 2014-06-04 18:34:12 -05:00
Daniel Wallace
5d67667dbe fix pylint for sentry_mod 2014-06-04 18:33:31 -05:00
Erik Johnson
3890872164 Merge pull request #13242 from basepi/requisitesdocs 
Clarify the watch requisite docs
 2014-06-04 17:19:04 -05:00
Colton Myers
5938016c85 Small clarification fix 2014-06-04 16:11:29 -06:00
Colton Myers
cd6617107e Revamp the `watch` requisite docs 2014-06-04 16:01:28 -06:00
Colton Myers
43c26360ee Use correct case for requisites (even in titles) 2014-06-04 15:48:00 -06:00
Thomas S Hatch
3219a07fe5 Merge pull request #13213 from gtmanfred/develop 
Replace already defaults to True
 2014-06-04 14:25:55 -06:00
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
Daniel Wallace
49e2ae01cb Replace already defaults to True 
This allows users to pass replace: False to file.recurse.

closes #13212
 2014-06-04 14:15:56 -05:00
Pedro Algarvio
1ba6f19b7c Fix white-space related lint issues 2014-06-04 14:15:56 -05: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