Commit Graph

37631 Commits

Author SHA1 Message Date
Thomas S Hatch
22c8a42180 Merge pull request #19552 from terminalmage/issue19540
Fix regression in pillar cache
2015-01-08 22:01:13 -07:00
Thomas S Hatch
47d1e65dfe Merge pull request #19556 from rallytime/fix_brew_mod
Add python_shell kwarg to brew module
2015-01-08 22:00:38 -07:00
rallytime
a8c9f95ab8 Add python_shell kwarg to brew module 2015-01-08 17:09:25 -07:00
Thomas S Hatch
8dd6f36c0c Merge pull request #19554 from rallytime/fix_disk_mod
Move python shell kwarg to correct place
2015-01-08 17:02:40 -07:00
rallytime
635898c850 Move python shell kwarg to correct place 2015-01-08 17:00:46 -07:00
Thomas S Hatch
2623aa672d Merge pull request #19541 from jfindlay/fix_pip
change one more pip command
2015-01-08 16:44:59 -07:00
Thomas S Hatch
081c96c43f Merge pull request #19537 from rallytime/bp-19344
Backport #19344 to 2014.7
2015-01-08 16:44:35 -07:00
Erik Johnson
1996656185 Look in local files for pillar data on masterless 2015-01-08 17:44:32 -06:00
Erik Johnson
e063c60691 Add a __pillar key to opts 2015-01-08 17:44:16 -06:00
Thomas S Hatch
31f825d9f2 Merge pull request #19539 from terminalmage/fix-archive-tests
Update archive tests to use python_shell=False
2015-01-08 16:43:09 -07:00
Thomas S Hatch
9f2ee27b02 Merge pull request #19542 from jfindlay/fixup_svn
fix svn module str + list error
2015-01-08 16:42:23 -07:00
Mike Place
854088c649 Merge pull request #19551 from cachedout/minor_note
Release note note
2015-01-08 16:41:46 -07:00
Mike Place
b419366443 Release note note
Fixes #18551
2015-01-08 16:41:20 -07:00
Nicole Thomas
c6bd6971d2 Merge pull request #19538 from rallytime/bp-19368
Backport #19368 to 2014.7
2015-01-08 16:39:05 -07:00
rallytime
ea769829af Fix my pylint errors 2015-01-08 15:09:55 -07:00
Justin Findlay
1768e429f5 fix svn module str + list error 2015-01-08 14:29:20 -07:00
Justin Findlay
b13532b547 change one more command 2015-01-08 13:57:10 -07:00
rallytime
41841701e7 Fix djangomod.py integration test failures 2015-01-08 12:57:11 -07:00
rallytime
2443d11282 Change file perms back to executable 2015-01-08 12:56:27 -07:00
rallytime
8eab15780e Change file perms on runtests.py 2015-01-08 12:56:17 -07:00
rallytime
a150447b15 pylint fix 2015-01-08 12:56:09 -07:00
rallytime
6f74048688 Fix blockdev module unit tests 2015-01-08 12:55:59 -07:00
Erik Johnson
ab23bf0332 Update archive tests to use python_shell=False 2015-01-08 13:51:47 -06:00
rallytime
4282db5f27 freebsd_sysctl module python shell kwarg additons 2015-01-08 12:34:04 -07:00
rallytime
439e60f960 freebsdservice module python shell kwarg additions 2015-01-08 12:34:04 -07:00
rallytime
a8f26aec90 extfs module python shell kwarg additions 2015-01-08 12:34:04 -07:00
rallytime
56395c3c77 dpkg module python shell kwarg additions 2015-01-08 12:34:04 -07:00
rallytime
9fab0788e1 django module python_shell=False additions 2015-01-08 12:34:04 -07:00
rallytime
50ae318794 disk module python_shell=False addition 2015-01-08 12:34:03 -07:00
rallytime
01e150b9b3 debconfmod module python_shell=False addition 2015-01-08 12:34:03 -07:00
rallytime
88a4dca5dc daemontools module python_shell=False additions 2015-01-08 12:34:03 -07:00
rallytime
d01c54aad6 composer module python_shell=False additon 2015-01-08 12:34:03 -07:00
rallytime
f5a6ca9ffe blockdev module python_shell=False addition 2015-01-08 12:31:30 -07:00
robert.fach
85e71699b0 fixed identation problem 2015-01-08 12:27:34 -07:00
robert.fach
ea1feb08e2 changed salt call to modules/svn.py svn.export function, added revision field to function call argument list 2015-01-08 12:27:34 -07:00
robert.fach
cf2119db17 changed salt call to modules/svn.py svn.export function, added revision field to function call argument list 2015-01-08 12:27:34 -07:00
Thomas S Hatch
fd174dbcf3 Merge pull request #19519 from terminalmage/archive-shell-fixes
Update archive.py to use python_shell=False
2015-01-08 11:54:55 -07:00
Thomas S Hatch
1e670f7b3e Merge pull request #19478 from thatch45/qp_shell
shellisms for q and p modules
2015-01-08 11:54:44 -07:00
Colton Myers
9b8e007d9a Merge pull request #19497 from basepi/shell-locale
Fix localemod.py to be more salty
2015-01-08 11:47:01 -07:00
Colton Myers
f31128bcc6 Merge pull request #19492 from basepi/shell01
Set python_shell=false
2015-01-08 11:45:29 -07:00
Mike Place
090bad4089 Merge pull request #19533 from basepi/KILL_THE_PRINTS_WITH_FIRE
Kill prints with fire
2015-01-08 11:43:36 -07:00
Colton Myers
2828fc06be Kill the print with fire 2015-01-08 11:32:34 -07:00
Erik Johnson
67aa42f7a2 more docstring updates 2015-01-08 11:58:43 -06:00
Colton Myers
522467f546 Fix gem failure 2015-01-08 10:42:55 -07:00
Thomas S Hatch
54afd2a934 Merge pull request #19488 from thatch45/kl_shell
migrate to new shellisms modules k-l
2015-01-08 10:28:10 -07:00
Thomas S Hatch
5ddd8abdfd Merge pull request #19484 from thatch45/mno_shell
Migrate shellisms for m, n and o modules
2015-01-08 10:27:52 -07:00
Thomas S Hatch
792b0ba9c6 added the shell call to too many tests 2015-01-08 10:13:50 -07:00
Thomas S Hatch
e94359d657 Merge pull request #19521 from thatch45/amendlik-chef-windows-compat
Merge #19493
2015-01-08 09:49:53 -07:00
Thomas S Hatch
54754c315b Merge branch 'chef-windows-compat' of https://github.com/amendlik/salt into amendlik-chef-windows-compat
Conflicts:
	salt/modules/chef.py
2015-01-08 09:48:19 -07:00
Thomas S Hatch
f81d068164 Merge pull request #19491 from thatch45/hi_shell
Shell migration for g, h and i
2015-01-08 09:44:35 -07:00