Commit Graph

12589 Commits

Author SHA1 Message Date
Thomas S Hatch
19a732d119 Fix #4690 2013-05-01 12:33:56 -06:00
Thomas S Hatch
78cc6a506c Merge pull request #4702 from hulu/retrive-sic-spelling
fix typo: retrive -> retrieve
2013-05-01 11:06:57 -07:00
Thomas S Hatch
d700bd3082 Merge pull request #4701 from cvrebert/patch-1
copyedit returners.mongo_future_return.get_load() docstring
2013-05-01 11:06:26 -07:00
Chris Rebert
cde0737637 fix typo: retrive -> retrieve 2013-05-01 11:00:52 -07:00
Chris Rebert
f02caa3a39 copyedit returners.mongo_future_return.get_load() docstring 2013-05-01 10:56:42 -07:00
Thomas S Hatch
de6e7105fb Fix #4678 2013-05-01 11:51:28 -06:00
Joseph Hall
d4296d2c3d Merge pull request #4700 from hulu/file._psed-unused-var-cmd
rm unused var 'cmd' from modules.file._psed()
2013-05-01 10:48:27 -07:00
Chris Rebert
a8b5f60f90 rm unused var 'cmd' from modules.file._psed 2013-05-01 10:41:05 -07:00
Thomas S Hatch
10c36da984 Fix #4662 2013-05-01 11:22:52 -06:00
Thomas S Hatch
334216aaa4 Bad ref to clear_load instead of load 2013-05-01 11:20:53 -06:00
Thomas S Hatch
7afd977fcd Add peer to master defaults 2013-05-01 11:15:39 -06:00
Thomas S Hatch
e556cc31ea Merge pull request #4693 from hulu/mongodb-fixes
fixes to modules.mongodb.db_exists
2013-05-01 09:18:11 -07:00
Thomas S Hatch
f060ef5e3a Merge pull request #4689 from hulu/file-typo
fix apparent typo in modules.file.manage_file
2013-05-01 09:17:17 -07:00
Thomas S Hatch
6bd9145703 Merge pull request #4688 from hulu/batch
cli.batch: fix typo, use idiomatic var name
2013-05-01 09:16:51 -07:00
Thomas S Hatch
c1138ab381 Merge pull request #4687 from hulu/avoid-namespace-collision
version.py: rename exception var so distinct from stderr string var
2013-05-01 09:16:00 -07:00
Thomas S Hatch
94d54a556c Merge pull request #4679 from hulu/cobbler-ext_pillar-only
improve pillar.cobbler.ext_pillar()
2013-05-01 09:15:31 -07:00
Thomas S Hatch
87f4d20b15 Merge pull request #4677 from hulu/operator-spacing-pylint
add whitespace around operators based on pylint report
2013-05-01 09:15:00 -07:00
Thomas S Hatch
3a19974cfa Merge pull request #4676 from hulu/fix-indentation-pylint
fix bad/inconsistent indentation reported by pylint
2013-05-01 09:14:08 -07:00
Thomas S Hatch
4023bcf5ae Merge pull request #4675 from Learnosity/master_grain
Added the 'master' grain to give the minion its master
2013-05-01 09:13:04 -07:00
Thomas S Hatch
6a1ad32904 Fix issue where safe_walk would skip files 2013-05-01 10:09:49 -06:00
Thomas S Hatch
1e9579826d Connect new safe_walk into the file server 2013-05-01 10:09:49 -06:00
Thomas S Hatch
6679153d7b Add safe_walk function to utils 2013-05-01 10:09:49 -06:00
Thomas S Hatch
2be37e9da7 Merge pull request #4694 from s0undt3ch/develop
Avoid `KeyError`. Refs 6cf74b7
2013-05-01 09:07:49 -07:00
Joseph Hall
1e57fc2d44 Merge pull request #4683 from hulu/img-mnt_image-fix
Minor fixes in modules.img
2013-05-01 07:05:25 -07:00
Joseph Hall
07ab051090 Merge pull request #4684 from hulu/minion-typos
fix some typos / capitalization in minion.py
2013-05-01 07:04:29 -07:00
Pedro Algarvio
001d00a639 Avoid KeyError. Refs 6cf74b7 2013-05-01 12:03:43 +01:00
Chris Rebert
da5488929b fixes to modules.mongodb.db_exists 2013-04-30 22:12:17 -07:00
Chris Rebert
8222b437c6 fix apparent typo in modules.file.manage_file 2013-04-30 21:48:41 -07:00
Chris Rebert
5a740cfc18 cli.batch: fix typo, use idiomatic var name 2013-04-30 21:42:43 -07:00
Chris Rebert
6a72f31672 version.py: rename exception so distinct from stderr string 2013-04-30 21:38:16 -07:00
Chris Rebert
f1c3daa73a fix some typos / capitalization in minion.py 2013-04-30 21:03:30 -07:00
Chris Rebert
b1ed8e4b96 fix typo in states.img.umount_image: 'fomat' -> 'format' 2013-04-30 20:57:27 -07:00
Chris Rebert
35429dc258 add missing .format() in modules.img.mnt_image 2013-04-30 20:54:31 -07:00
Chris Rebert
b7c6361a13 improve pillar.cobbler.ext_pillar()
avoid mutable default argument value
approximate a dict comprehension
2013-04-30 20:16:57 -07:00
Chris Rebert
fe9992d846 add whitespace around operators based on pylint report 2013-04-30 19:40:11 -07:00
Alan Garfield
a33c93c9ef Fixed a grammar issue in the comments 2013-05-01 12:35:56 +10:00
Chris Rebert
e653c0dbb4 fix bad & tab indentation reported by pylint 2013-04-30 19:12:24 -07:00
Alan Garfield
bada5b3d57 Added the 'master' grain to give the minion it's master 2013-05-01 11:41:45 +10:00
David Boucha
3a987b1502 Merge pull request #4673 from hulu/fix-munin-tautology
fix modules.munin.run check: plugins -> all_plugins
2013-04-30 17:36:00 -07:00
Chris Rebert
f1468492e0 fix modules.munin.run check: plugins -> all_plugins 2013-04-30 17:11:10 -07:00
Thomas S Hatch
5e5df60aaa Merge branch 'prune-unused-imports' of git://github.com/hulu/salt into hulu-prune-unused-imports
Conflicts:
	salt/modules/systemd.py
2013-04-30 17:49:43 -06:00
Thomas S Hatch
735eecd7c7 Merge pull request #4672 from hulu/copyediting
copyediting: fix adjacent word repetitions
2013-04-30 16:44:47 -07:00
Thomas S Hatch
070545012b Merge pull request #4671 from cvrebert/patch-5
copyedit modules.rabbitmq.list_vhosts docstring
2013-04-30 16:44:04 -07:00
Thomas S Hatch
81bdfb80b3 Merge pull request #4670 from cvrebert/patch-4
copyedits to modules.file.psed()'s docstring
2013-04-30 16:43:39 -07:00
Thomas S Hatch
e632ead738 Merge pull request #4665 from cvrebert/patch-2
copyedit AESFuncs.revoke_auth() docstring in master.py
2013-04-30 16:41:53 -07:00
Thomas S Hatch
f54e649430 Merge pull request #4664 from cvrebert/patch-1
fix capitalization typo in apt.mod_repo() docstring
2013-04-30 16:41:31 -07:00
Chris Rebert
8447098762 copyediting: fix adjacent word repetitions 2013-04-30 16:40:49 -07:00
Thomas S Hatch
c9e29c25ef Merge pull request #4661 from basepi/filemanaged3516
Add contents arg for file.managed, Fixes #3516
2013-04-30 16:40:41 -07:00
Chris Rebert
6dd4b1d0ca copyedit modules.rabbitmq.list_vhosts docstring 2013-04-30 16:33:10 -07:00
Chris Rebert
677ef6e5d6 copyedits to modules.file.psed()'s docstring 2013-04-30 16:29:52 -07:00