Colton Myers
174290b7aa
Add python_shell=False to all the linux_acl mocks
2015-01-08 14:29:41 -07:00
Colton Myers
4f851c99ab
Fix gem tests
2015-01-08 14:26:04 -07:00
Colton Myers
d8942aacb3
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-01-08 11:47:08 -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
4760dc0fb0
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-01-08 11:45:43 -07:00
Colton Myers
f31128bcc6
Merge pull request #19492 from basepi/shell01
...
Set python_shell=false
2015-01-08 11:45:29 -07:00
Colton Myers
f5d3a61c86
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/modules/groupadd.py
2015-01-08 11:44:55 -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
00a5b8b341
Merge branch '2014.7' into merge-forward-2015.2
...
Conflicts:
salt/modules/groupadd.py
salt/modules/linux_lvm.py
salt/modules/mount.py
2015-01-08 11:41:19 -07:00
Colton Myers
2828fc06be
Kill the print with fire
2015-01-08 11:32:34 -07:00
Colton Myers
d516dc07a2
Merge pull request #19487 from basepi/merge-forward-2015.2
...
Merge forward from 2014.7 to 2015.2
2015-01-08 11:28:20 -07: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
Mike Place
edcc06cb36
Merge pull request #19525 from cachedout/postgres_fix_quote_2015
...
Another missed quote
2015-01-08 10:18:27 -07:00
Mike Place
bb0c32e44d
Another missed quote
...
Conflicts:
tests/unit/modules/postgres_test.py
2015-01-08 10:17:39 -07:00
Colton Myers
3bef11c085
Merge pull request #2 from whiteinge/git_pillar_touchup
...
Fix used-before-defined error with branch var in git_pillar
2015-01-08 09:52:46 -07:00
Seth House
a428023d89
Fix used-before-defined error with branch var in git_pillar
2015-01-08 09:50:27 -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
Colton Myers
e7b79de8da
Merge branch '2014.7' into merge-forward-2015.2
...
Conflicts:
salt/modules/ebuild.py
2015-01-08 09:28:12 -07:00
Nicole Thomas
80039305ab
Merge pull request #19504 from rallytime/fix_linux_acl_tests
...
Fix linux_acl tests
2015-01-07 20:57:25 -07:00
rallytime
4aa60ce51a
Fix linux_acl tests
2015-01-07 20:55:19 -07:00
Nicole Thomas
392de2a974
Merge pull request #19503 from terminalmage/fix-dig-tests
...
Fix dig tests
2015-01-07 20:43:58 -07:00
Erik Johnson
5edba8e55e
Add back double-quote
...
This is in the actual dig output, I shouldn't have removed it.
2015-01-07 20:05:43 -06:00
Erik Johnson
98e2e33338
Fix dig tests
...
This fixes the dig tests after dig.py was modified to use
python_shell=False.
2015-01-07 19:59:16 -06:00
Mike Place
9f548bfac5
Merge pull request #19498 from cachedout/linux_facl_2015
...
Use full arg for getfacl
2015-01-07 16:47:06 -07:00
Mike Place
75111c6b78
Use full arg for getfacl
2015-01-07 16:46:27 -07:00
Colton Myers
a5a1a42e2c
Fix localemod.py to be more salt instead of relying on shellisms
2015-01-07 16:28:42 -07:00
Mike Place
6dcd749b2b
Merge pull request #19494 from cachedout/fix_failing_postgres
...
Some expressions are not so regular
2015-01-07 16:11:27 -07:00
Thomas S Hatch
615921b619
Merge pull request #19483 from basepi/shell02
...
Set python_shell=False
2015-01-07 16:04:42 -07:00
Thomas S Hatch
872c790b01
xapi python shell migration
2015-01-07 16:00:01 -07:00
Thomas S Hatch
c9cae84bfe
zcbuildout python shell migration
...
I could not find any shell refs in here, but this may cause problems
2015-01-07 15:56:48 -07:00
Mike Place
3830162952
Some expressions are not so regular
2015-01-07 15:53:07 -07:00
Thomas S Hatch
ed81bf73d4
shell migrate gnomedesktop module
2015-01-07 15:46:56 -07:00
Colton Myers
d6687f04c2
Set python_shell=False for git.py
2015-01-07 15:46:34 -07:00
Thomas S Hatch
e6ea4a914c
groupadd shell migration
2015-01-07 15:45:56 -07:00
Adam Mendlik
65707c09a6
Add stdout to the comments in the Chef state module
2015-01-07 15:43:47 -07:00
Colton Myers
e7e55e2426
Set python_shell=False for gentoo_service.py
2015-01-07 15:43:40 -07:00
Thomas S Hatch
a7249d9c08
guestfs shell migration
2015-01-07 15:43:01 -07:00
Thomas S Hatch
3d49a8bc40
hadoop shell migration
2015-01-07 15:41:57 -07:00
Thomas S Hatch
a944bca224
incron shell migration
2015-01-07 15:40:35 -07:00
Colton Myers
424cc430cf
Set python_shell=False for gentoolkitmod.py
2015-01-07 15:40:11 -07:00
Colton Myers
239b0bf7c9
Set python_shell=False for gem.py
2015-01-07 15:39:30 -07:00
Adam Mendlik
bf9c4ba9e8
Add Windows compatibility to the Chef module
...
1) Remove the dependency on the Linux 'script' utility
2) Force command output using the --format option
3) Provide a default logfile location for Windows
2015-01-07 15:39:19 -07:00
Thomas S Hatch
e6ec612a04
ipset module shell migration
2015-01-07 15:39:09 -07:00
Colton Myers
3202348b6c
Fix error in git_pillar.py
2015-01-07 15:33:56 -07:00
Thomas S Hatch
42cbe735eb
kmod shell migration
2015-01-07 15:32:27 -07:00
Colton Myers
1feaad2048
Fix error in zpool.py
2015-01-07 15:32:12 -07:00
