Mike Place
|
5f6f52f08d
|
Minor doc issue
Closes #16227
|
2015-01-08 16:50:38 -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 |
|
Thomas S Hatch
|
7941a4a738
|
Merge pull request #19534 from basepi/merge-forward-2015.2
Merge forward from 2014.7 to 2015.2
|
2015-01-08 16:44:18 -07: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 |
|
Flavian
|
3fe0ec8b58
|
Azure: catch a benign WindowsAzureConflictError when trying to create a
service that already exists. In delete if kwargs is None, set it to an
empty dict.
#19155
|
2015-01-08 16:23:28 -07:00 |
|
vs
|
10e772cf21
|
improve master.status to work with host fqdns/hostnames as well as ips
The former version only worked with IPs which is kind of limited and
has been reported as bugs.
|
2015-01-08 16:17:26 -07:00 |
|
Thomas Jackson
|
48aa021067
|
Cache channel auth based on master_uri and minion_id
|
2015-01-08 14:39:28 -08:00 |
|
Thomas Jackson
|
f5347be759
|
Revert "Revert "Cleanup and performance tweaks""
This reverts commit 86e231bb51.
|
2015-01-08 14:38:17 -08:00 |
|
rallytime
|
ea769829af
|
Fix my pylint errors
|
2015-01-08 15:09:55 -07:00 |
|
Mike Place
|
372cd762c6
|
Merge pull request #19544 from saltstack/revert-19318-develop
Revert "Cleanup and performance tweaks"
|
2015-01-08 14:57:57 -07:00 |
|
Mike Place
|
86e231bb51
|
Revert "Cleanup and performance tweaks"
|
2015-01-08 14:57:04 -07:00 |
|
Colton Myers
|
174290b7aa
|
Add python_shell=False to all the linux_acl mocks
|
2015-01-08 14:29:41 -07:00 |
|
Justin Findlay
|
1768e429f5
|
fix svn module str + list error
|
2015-01-08 14:29:20 -07:00 |
|
Colton Myers
|
4f851c99ab
|
Fix gem tests
|
2015-01-08 14:26:04 -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
|
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 |
|