Commit Graph

15058 Commits

Author SHA1 Message Date
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
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
Joseph Hall
5da46200a1 Merge pull request #5988 from hulu/enable-msg-deprecated
pylint pragmas: `enable-msg` is deprecated, replace it with `enable`
2013-07-05 16:37:36 -07:00
Chris Rebert
8fc4066215 pylint pragmas: enable-msg is deprecated, replace it with enable
fixes pylint runtime "DeprecationWarning: enable-msg is deprecated, replace it with enable" messages
2013-07-05 15:31:54 -07:00
Pedro Algarvio
13bb4e5e61 Merge pull request #5981 from hulu/buddhist-marxist
Depends.enforce_dependencies: self => cls, since it's a classmethod
2013-07-05 15:24:01 -07:00
Pedro Algarvio
446f26ca67 Merge pull request #5984 from cvrebert/patch-1
OutputOptionsWithTextMixIn.__new__(): wrong class in super() call
2013-07-05 15:22:45 -07:00
Pedro Algarvio
f42420de07 Merge pull request #5987 from cvrebert/patch-2
call dict.__init__() in OrderedDict.__init__()
2013-07-05 15:17:39 -07:00
Chris Rebert
4ac976d9a9 call dict.__init__() in OrderedDict.__init__()
************* Module salt.utils.odict
W0231: 50,12:OrderedDict.__init__: __init__ method from base class 'dict' is not called
2013-07-05 15:01:01 -07:00
Pedro Algarvio
a886eaa03d Add a state integration test case for #5940. 2013-07-05 23:00:14 +01:00
Erik Johnson
6020b9d293 Merge pull request #5985 from aboe76/fix_suse_salt-syndic-init
fix salt-syndic Fixes #5954.
2013-07-05 14:36:24 -07:00
Niels Abspoel
4fa78a44f6 fix salt-syndic Fixes #5954. 2013-07-05 23:34:28 +02:00
Chris Rebert
33b144bc30 OutputOptionsWithTextMixIn.__new__(): wrong class in super() call
************* Module salt.utils.parsers
E1003:854,4:OutputOptionsWithTextMixIn.__new__: Bad first argument 'OutputOptionsMixIn' given to super class
2013-07-05 14:20:22 -07:00
Erik Johnson
0cf1f5294d Make saltutil.sync_all output more meaningful
The default (nested) outputter makes lists of lists look odd. So,
instead of returning a list of lists, return a dict with the keys being
the names of the different custom types, and the values being the lists
of modules of that type that were synced.

Fixes #5964.
2013-07-05 16:12:40 -05:00
Chris Rebert
e7ab8f5db6 Depends.enforce_dependencies: self => cls, since it's a classmethod 2013-07-05 14:04:04 -07:00
Thomas S Hatch
d0b9da0f36 Merge pull request #5980 from hulu/dependency-spelling
fix spelling: dependancy ==> dependency
2013-07-05 13:38:13 -07:00
David Boucha
b7e02fe3fd Merge pull request #5979 from terminalmage/quickfix
Fix traceback introduced in c985e60
2013-07-05 13:37:27 -07:00
Thomas S Hatch
546cfc63d2 Merge pull request #5971 from terminalmage/issue5956
Quiet warning for missing default_path kwarg
2013-07-05 13:36:44 -07:00
Chris Rebert
bf03461f00 fix spelling: dependancy ==> dependency 2013-07-05 13:35:53 -07:00
Erik Johnson
09cc692c23 Fix traceback introduced in c985e60
c985e60 from earlier today broke a lot of things, because of a
misreading of how getattr was being called. This commit fixes that.
2013-07-05 15:32:13 -05:00
Joseph Hall
0398c46412 Merge pull request #5976 from hulu/refactor-weird-try-except
avoid unusual try-except; use if-else instead
2013-07-05 13:25:10 -07:00
Joseph Hall
26a9bc35b3 Merge pull request #5975 from hulu/__new__-style-fix
fix name of 1st param of SaltLoggingClass.__new__()
2013-07-05 13:24:46 -07:00
Joseph Hall
9bcb435e43 Merge pull request #5974 from cvrebert/patch-1
tops/reclass_adapter.py: add missing import of `sys` since sys.path is used
2013-07-05 13:24:19 -07:00
Joseph Hall
2ae7f4f2e2 Merge pull request #5978 from hulu/win_dns_client
win_dns_client state fixes
2013-07-05 13:23:50 -07:00
Chris Rebert
188a587f95 states.win_dns_client.dns_exists: use enumerate() 2013-07-05 13:16:44 -07:00
Chris Rebert
0c3044e89b states.win_dns_client.dns_exists: fix list slicing 2013-07-05 13:16:11 -07:00
Chris Rebert
d61b57e9d5 states.win_dns_client: proper acronym caps 2013-07-05 13:12:28 -07:00
Chris Rebert
d3ef43d9a4 avoid unusual try-except; use if-else instead
************* Module salt.states.win_servermanager
W0106: 40,8:installed: Expression "__salt__['win_servermanager.list_installed']()[name]" is assigned to nothing
2013-07-05 13:05:11 -07:00
Chris Rebert
bc5ec198ef fix name of 1st param of SaltLoggingClass.__new__()
************* Module salt.log
C0202:142,4:SaltLoggingClass.__new__: Class method __new__ should have 'cls' as first argument
2013-07-05 12:53:34 -07:00
Chris Rebert
039bbb6559 tops/reclass_adapter.py: add missing import of sys since sys.path is used 2013-07-05 12:30:34 -07:00
David Boucha
69697bb7a3 Merge pull request #5973 from hulu/fix-indents
Fix wrong indentation style
2013-07-05 12:29:35 -07:00