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
ed8737fa95
Merge pull request #19318 from jacksontj/develop
...
Cleanup and performance tweaks
2015-01-08 12:27:29 -07:00
Mike Place
ca9a871d43
Merge pull request #19536 from rallytime/pip_test_fix
...
Don't run weird pip install test on CentOS 5
2015-01-08 12:21:08 -07:00
rallytime
71ef3f7744
Keep package name the same
2015-01-08 12:13:26 -07:00
rallytime
a0f801f475
Skip this test when we are running on centOS 5
2015-01-08 12:11:51 -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
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
a60fa6b3d1
Merge branch '2015.2' into develop
2015-01-08 11:29:08 -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
Mike Place
432776ef61
Merge pull request #19531 from cachedout/log_refresh
...
Let's get more debug info about how often refreshes are happening
2015-01-08 11:09:16 -07:00
Mike Place
3ce17f277b
Let's get more debug info about how often refreshes are happening
2015-01-08 11:08:38 -07:00
Erik Johnson
67aa42f7a2
more docstring updates
2015-01-08 11:58:43 -06:00
Mike Place
e884956fb2
Merge pull request #19529 from cachedout/lint_gpg
...
Lint
2015-01-08 10:57:23 -07:00
Mike Place
dd64751432
Lint
2015-01-08 10:56:53 -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
1b4f06a520
Merge pull request #19526 from cachedout/postgres_fix_quote
...
Another missed quote
2015-01-08 10:18:40 -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
Mike Place
68b6815883
Another missed quote
2015-01-08 10:16:02 -07:00
Thomas S Hatch
792b0ba9c6
added the shell call to too many tests
2015-01-08 10:13:50 -07:00
Mike Place
3ffb761581
Merge pull request #19523 from cachedout/tornado_timeouts
...
Try giving some rest tornado requests a little more time
2015-01-08 10:05:03 -07:00
Mike Place
d6ce858c23
Try giving some rest tornado requests a little more time
2015-01-08 10:04:19 -07:00
Thomas S Hatch
0529136858
Merge pull request #19510 from JensRantil/sphinx-1.3b2
...
doc(dev-bootstrap): Sphinx 1.3b2
2015-01-08 09:57:42 -07:00
Thomas S Hatch
9d8e6ca787
Merge pull request #19495 from twellspring/patch-2
...
Add documentation for renderes in pillar files
2015-01-08 09:57:19 -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
Georges Racinet
e94fe6de31
Mark function as private
...
With the leading underscore, _obfuscate_inner should be excluded from the CLI
(and the related lint tests)
2015-01-08 17:41:49 +01:00
Georges Racinet
905a0381c8
Proper versionadded tags
2015-01-08 17:38:17 +01:00
Joseph Hall
74da8a314b
Merge pull request #19517 from Trax-air/fix-azure-cloud-service
...
Azure: fixes VM creation under another service name
2015-01-08 09:36:17 -07:00
rallytime
5490530504
Change the install package to fix pip tests
2015-01-08 09:32:53 -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
Georges Racinet
eb70dcf67d
Provide modules.pillar.obfuscate and modules.pillar.ls
...
This fulfills #19329 . As explained there, 'ls' is not that useful, but
still including it for completeness.
Also first attempt at writing a unit test within salt.
2015-01-08 09:44:51 +01:00
Jens Rantil
9e92864398
doc(dev-bootstrap): Sphinx 1.3b2
...
I was getting an error that the current stable version of Sphinx wasn't
new enough. Installing Sphinx 1.3b2 did the trick.
2015-01-08 08:04:11 +01:00
