Commit Graph

16038 Commits

Author SHA1 Message Date
Pedro Algarvio
a4a484a3e6 Typo. 2013-07-28 17:18:39 +01:00
Pedro Algarvio
ef4e2eff44 Formatting fixes.
* Double to single quotes.
* Wrap CLI examples.
* Removed unneeded commas from `.format()` call arguments.
* Replaced string substitutions(ie, `%s`) with string formatting(`.format()`)
2013-07-28 17:15:16 +01:00
Joseph Hall
0d3218ec2b Merge pull request #6396 from ranl/develop
tomcat.passwd function
2013-07-28 09:04:13 -07:00
Pedro Algarvio
0180c7b1fd Properly parse a PSQL server version, even beta versions. Fixes #6352. 2013-07-28 16:46:58 +01:00
ran
7903b5d785 docstring fix 2013-07-28 17:23:34 +03:00
ran
01ea85d802 tomcat.passwd function, convert clear-text password to tomcat-users.xml file 2013-07-28 17:18:53 +03:00
Joseph Hall
d64dfdc70a Merge pull request #6395 from s0undt3ch/sprint/mock-salt.modules.alternatives
Also test for `retcode > 0`.
2013-07-28 05:18:29 -07:00
Pedro Algarvio
5d0af6268e Mocked test for salt.modules.archive.gunzip() 2013-07-28 12:51:13 +01:00
Pedro Algarvio
99b8f2f70f Mocked test for salt.modules.archive.gzip() 2013-07-28 12:50:05 +01:00
Pedro Algarvio
3d17053e3f Also test for retcode > 0. 2013-07-28 12:41:15 +01:00
David Boucha
50bb0eb0f0 Merge pull request #6394 from UtahDave/develop
user proper spaces around '='
2013-07-28 00:19:21 -07:00
David Boucha
3f8c91f1d1 user proper spaces around '=' 2013-07-28 01:13:52 -06:00
David Boucha
a666fb07d2 Merge pull request #6393 from UtahDave/develop
Fix pylin errors in win_useradd.py
2013-07-27 23:59:10 -07:00
David Boucha
88bdc2ca40 Fix pylin errors in win_useradd.py 2013-07-28 00:57:39 -06:00
David Boucha
cc0155834c Merge pull request #6392 from UtahDave/develop
Document new Windows Repo module
2013-07-27 23:52:48 -07:00
David Boucha
5a8fb7a38d better wording in winrepo 2013-07-28 00:50:44 -06:00
David Boucha
81bf77f4d3 mention winrepo execution module 2013-07-28 00:48:04 -06:00
David Boucha
65b2b66080 Merge pull request #6391 from iquaba/develop
Windows list_users
2013-07-27 19:03:36 -07:00
iquaba
b7e8be7017 missed an 's' in utils 2013-07-27 20:51:23 -05:00
iquaba
c9c4c0fe4b fixed typos in list_users 2013-07-27 20:49:08 -05:00
iquaba
d4b14eb732 adds list_users for Windows 2013-07-27 20:45:18 -05:00
Walter Scott
c0eaac5664 removed unintended tab characters 2013-07-27 19:01:32 -06:00
Joseph Hall
2f4837cb42 Merge pull request #6390 from terminalmage/quickfix
Fix warning during minion auth due to invalid config param type
2013-07-27 17:55:46 -07:00
Erik Johnson
fae7a1576c Fix warning during minion auth due to invalid config param type 2013-07-27 19:53:15 -05:00
Joseph Hall
6c346965e6 Merge pull request #6389 from hulu/fix-win_autoruns
fix pylint problems in modules.win_autoruns
2013-07-27 17:52:52 -07:00
Chris Rebert
9c0beaa0ff fix pylint problems in modules.win_autoruns 2013-07-27 17:50:35 -07:00
Joseph Hall
28b05f117a Merge pull request #6388 from iquaba/develop
Windows Autorun Enumerator
2013-07-27 17:42:20 -07:00
Walter Scott
f56c20d4c1 added logic to umount a mounted filesystem when the mountpoint matches but the device does not (6079) 2013-07-27 18:42:15 -06:00
iquaba
1d0e75f29c Adds windows autoruns enumerator 2013-07-27 19:37:40 -05:00
Thomas S Hatch
ef1ad71441 Merge pull request #6387 from hulu/file-avoid-stats-shadowing
file mod: avoid shadowing stats() function
2013-07-27 17:23:54 -07:00
Thomas S Hatch
3754a2f720 Merge pull request #6386 from hulu/_osx_gpudata-unused-arg
rm unused arg osdata from _osx_gpudata
2013-07-27 17:23:35 -07:00
Thomas S Hatch
08dbd2a741 Merge pull request #6385 from KB1JWQ/fixlogwarn
Add break statement to avoid obvious warning; linux tools don't live on OS X
2013-07-27 17:23:16 -07:00
Chris Rebert
45efb0a1a1 file mod: avoid shadowing stats() function 2013-07-27 17:18:37 -07:00
Chris Rebert
051b618aeb rm unused arg osdata from _osx_gpudata 2013-07-27 17:14:33 -07:00
Corey Quinn
c5b171689b Add break statement to avoid obvious warning 2013-07-27 17:10:15 -07:00
Joseph Hall
598c17ecb3 Merge pull request #6383 from hulu/fix-apache-indents
modules.apache: 2-space indents => 4-space indents
2013-07-27 17:00:57 -07:00
Chris Rebert
abf296e388 modules.apache: 2-space indents => 4-space indents 2013-07-27 16:59:34 -07:00
Thomas S Hatch
4720b5bc47 Merge pull request #6382 from hulu/fix-file-restore_backup
file.restore_backup: FileNotFoundError is from Python 3; rm pointless 'pass'
2013-07-27 16:56:02 -07:00
Chris Rebert
bcad68b08b FileNotFoundError is from Python 3; rm pointless 'pass' 2013-07-27 16:53:11 -07:00
Thomas S Hatch
7cd8b429b0 Merge pull request #6381 from hulu/minion-indents
fix indents in minion.py
2013-07-27 16:51:44 -07:00
Thomas S Hatch
f5a77bdc9b Merge pull request #6380 from KB1JWQ/osxfixversion
OS X now has an osrelease grain
2013-07-27 16:51:13 -07:00
Chris Rebert
0a1e601bbd fix indents in minion.py 2013-07-27 16:49:33 -07:00
Corey Quinn
5f9df22287 OS X now has an os version 2013-07-27 16:49:05 -07:00
Corey Quinn
e3a4c88aa7 Merge branch 'develop' of github.com:saltstack/salt into osxfixversion 2013-07-27 16:47:20 -07:00
Thomas S Hatch
82a5f858a2 Check for type errors on valid config arguments 2013-07-27 17:46:04 -06:00
Thomas S Hatch
1040387b8a Merge pull request #6379 from doublerr/apacheTasks
fix spacing, switch to cmd.retcode
2013-07-27 16:40:05 -07:00
Corey Quinn
8d95fd421c Add osversion to OS X 2013-07-27 16:39:16 -07:00
Thomas S Hatch
78064fa14a Merge pull request #6378 from naiyt/develop
Populate __context__ with retcode; Fixes issue #5518
2013-07-27 16:39:05 -07:00
Ryan Richard
ac8eba0d9b fix spacing, switch to cmd.retcode 2013-07-27 23:30:31 +00:00
Joseph Hall
ed29fa103a Merge pull request #6376 from terminalmage/issue6322
Add functions to manage file backups
2013-07-27 16:27:13 -07:00