Xavier Barbosa
30c862a6f2
fixed jinja template helper
2013-07-08 15:04:09 +02:00
Xavier Barbosa
48334025f2
added file.serialize state
2013-07-08 14:59:56 +02:00
Xavier Barbosa
02f48b7480
added 2 jinja filters: yaml and json
2013-07-08 14:26:39 +02:00
Thomas S Hatch
18e270d3a6
Merge pull request #6032 from terminalmage/docs
...
Document defining custom grains in /etc/salt/grains
2013-07-07 21:26:19 -07:00
Erik Johnson
11b79f9bce
Document defining custom grains in /etc/salt/grains
2013-07-07 23:23:27 -05:00
Thomas S Hatch
00f5968d72
Merge pull request #6026 from extesy/patch-1
...
Support pyvenv in virtualenv module
2013-07-07 21:07:05 -07:00
David Boucha
691645e932
Merge pull request #6028 from terminalmage/issue6021
...
Fix mod_watch for supervisord state
2013-07-07 21:00:10 -07:00
Erik Johnson
fb6c8d26c1
Fix mod_watch for supervisord state
...
The "update" param was not being taken into account by mod_watch,
causing parameters to be passed in the wrong order and ignoring the
"update" param altogether. This commit corrects that.
Fixes #6021 .
2013-07-07 22:50:28 -05:00
Oleg Anashkin
e368b05b43
Support pyvenv in virtualenv module
2013-07-07 19:15:25 -07:00
Joseph Hall
16d9ebc9cd
Merge pull request #6018 from cvrebert/syndic-local-pylint
...
Only Syndic minions have .local; push .local cleanup down into Syndic class
2013-07-07 14:34:20 -07:00
Joseph Hall
5c1ad5b571
Merge pull request #6019 from cvrebert/patch-1
...
minion.py: caps in comments
2013-07-07 14:33:34 -07:00
Chris Rebert
ac68cbcf35
minion.py: caps in comments
2013-07-07 13:54:41 -07:00
Chris Rebert
d3603a3203
Only Syndic minions have .local; push .local cleanup down into Syndic class
...
************* Module salt.minion
E1101:1126,16:Minion.destroy: Instance of 'Minion' has no 'local' member
2013-07-07 13:47:27 -07:00
Pedro Algarvio
6d1834f102
Merge pull request #6010 from cvrebert/patch-1
...
tops/reclass_adapter.py: string.find(X) > -1 ==> X in string
2013-07-07 13:32:53 -07:00
Pedro Algarvio
5263f396c8
Merge pull request #6011 from cvrebert/patch-2
...
pillar/reclass_adapter.py: string.find(X) > -1 ==> X in string
2013-07-07 13:32:33 -07:00
Pedro Algarvio
a1d9e316d1
Merge pull request #6015 from cvrebert/patch-4
...
salt/utils/yamlloader.py: fix typos in comments
2013-07-07 13:32:11 -07:00
Pedro Algarvio
3f04b02240
Merge pull request #6016 from cvrebert/patch-3
...
modules/yumpkg5.py: rm unused import of `os`
2013-07-07 13:31:49 -07:00
Pedro Algarvio
21173ccad9
Merge pull request #6017 from cvrebert/patch-5
...
cli/caller.py: rm unused import of `yaml`
2013-07-07 13:30:09 -07:00
Chris Rebert
1bb85328c1
cli/caller.py: rm unused import of yaml
...
************* Module salt.cli.caller
W0611: 29,0: Unused import yaml
2013-07-07 13:09:38 -07:00
Chris Rebert
b3da87d858
modules/yumpkg5.py: rm unused import of os
...
************* Module salt.modules.yumpkg5
W0611: 9,0: Unused import os
2013-07-07 13:07:20 -07:00
Chris Rebert
1c2a06d189
salt/utils/yamlloader.py: fix typos in comments
2013-07-07 12:58:16 -07:00
Pedro Algarvio
0e73cc3e5b
Merge pull request #6014 from hulu/mcs
...
Fix metaclass __new__() parameter naming: cls ==> mcs
2013-07-07 12:28:33 -07:00
Pedro Algarvio
db4bed63a2
Merge pull request #6012 from hulu/just-use-the-in-operator
...
Just use the `in` operator instead of mucking around with `str.find()`
2013-07-07 12:25:45 -07:00
Pedro Algarvio
4f09f40ffa
Merge pull request #6013 from cvrebert/patch-3
...
__NewStyleClassMixIn => _NewStyleClassMixIn
2013-07-07 12:21:58 -07:00
Chris Rebert
a45d19ac7f
Fix metaclass __new__() parameter naming: cls ==> mcs
...
************* Module salt.utils.parsers
C0204: 43,4:MixInMeta.__new__: Metaclass class method __new__ should have 'mcs' as first argument
C0204: 54,4:OptionParserMeta.__new__: Metaclass class method __new__ should have 'mcs' as first argument
2013-07-07 12:17:22 -07:00
Chris Rebert
36d8969859
one underscore is sufficient: __NewStyleClassMixIn => _NewStyleClassMixIn
2013-07-07 12:08:30 -07:00
Chris Rebert
a43a2af005
string.find(substr) <comparison> <0 OR -1> ==> substr <in OR not in> string
2013-07-07 11:52:52 -07:00
Chris Rebert
b60e305b8b
pillar/reclass_adapter.py: string.find(X) > -1 ==> X in string
2013-07-07 11:42:31 -07:00
Chris Rebert
c290778f76
tops/reclass_adapter.py: string.find(X) > -1 ==> X in string
2013-07-07 11:39:42 -07:00
Pedro Algarvio
f3e6e34ae3
Merge pull request #6007 from pille/fix-saltutil-doc
...
fix documentation to match function name saltutil.revoke_auth
2013-07-07 06:03:59 -07:00
Pedro Algarvio
47b49d3629
Merge pull request #6008 from ranl/develop
...
docfix in win_dns_client and added missing timezone in win_timezone
2013-07-07 06:02:37 -07:00
ran
2dc3dfef63
docfix in win_dns_client and added missing timezone in salt/modules/win_timezone.py
2013-07-07 15:55:14 +03:00
pille
31ac24f9c9
fix documentation to match function name saltutil.revoke_auth
2013-07-07 12:09:48 +02:00
David Boucha
f012d31b37
Merge pull request #6006 from ranl/develop
...
cli examples for rdp and win_servermanager modules
2013-07-07 00:32:58 -07:00
ran
871c4f2399
cli examples for rdp and win_servermanager modules
2013-07-07 10:31:06 +03:00
Thomas S Hatch
b12ce6c6e8
Start on salt-ssh manpage
2013-07-06 21:33:46 -06:00
Joseph Hall
2debb42b91
Merge pull request #6004 from terminalmage/suppress-binary-diff
...
Suppress binary diffs
2013-07-06 13:04:00 -07:00
Erik Johnson
b93c7248a4
Suppress binary diffs
...
This builds on the work done for #5457 , suppressing binary diffs in the
functions within the file module instead of just in the file state.
2013-07-06 14:33:01 -05:00
David Boucha
bf417a4158
Merge pull request #5982 from hulu/dependant-spelling
...
spelling: dependant ==> dependent
2013-07-06 11:54:02 -07:00
Chris Rebert
53c915c4c3
spelling: dependant ==> dependent
2013-07-06 11:44:02 -07:00
Joseph Hall
ab1a3fcc9b
Merge pull request #6002 from s0undt3ch/develop
...
Create a NO-OP mixin to shut up pylint. Fixes #5989 .
2013-07-06 09:45:57 -07:00
Pedro Algarvio
1f6bf6ec14
Create a NO-OP mixin to shut up pylint. Fixes #5989 .
...
Craeted a simple new style class to make pylint shut up, because SaltLoggingClass can't subclass `object` directly:
'Cannot create a consistent method resolution order (MRO) for bases'
2013-07-06 17:27:29 +01:00
Joseph Hall
f51df58b2c
Merge pull request #5983 from terminalmage/issue5964
...
Make saltutil.sync_all output more meaningful
2013-07-06 06:52:55 -07:00
Joseph Hall
09490c51f1
Merge pull request #5986 from s0undt3ch/issues/5940-multiple-pip-mirrors
...
Add a state integration test case for #5940 .
2013-07-06 06:51:55 -07:00
Joseph Hall
d21c005058
Merge pull request #5996 from s0undt3ch/issues/5989-old-style-classes-and-__new__
...
Let's make `SaltLoggingClass` a new style class. Fixes #5989 .
2013-07-06 06:50:17 -07:00
Joseph Hall
23b8c2103c
Merge pull request #5997 from s0undt3ch/issues/5970-minion.d
...
Added 2 test cases which prove that #5970 is invalid
2013-07-06 06:49:43 -07:00
Pedro Algarvio
66d86ca2d5
Added 2 test cases which prove that #5970 is invalid. Closes #5970 .
2013-07-06 12:48:13 +01:00
Pedro Algarvio
cafb1440fd
Let's make SaltLoggingClass a new style class. Fixes #5989 .
2013-07-06 11:57:36 +01:00
Pedro Algarvio
704a4b5c4e
Merge pull request #5995 from johnnoone/publish-session-typo
...
changed publish_sesion to publish_session into master
2013-07-06 03:06:01 -07:00
Xavier Barbosa
b1e57cb3ca
changed publish_sesion to publish_session into master
2013-07-06 11:14:47 +02:00
