Thomas S Hatch
|
24410ab644
|
Merge pull request #14431 from rallytime/fix_redis_versionadded
Add versionadded to new redis modules
|
2014-07-23 11:58:27 -06:00 |
|
Thomas S Hatch
|
bf49959ca2
|
Merge pull request #14421 from panoptix-za/fix_salt_ssh_thinclient_highstate
Fix salt-ssh highstate rendering
|
2014-07-23 11:54:40 -06:00 |
|
Thomas S Hatch
|
2099d43608
|
Merge pull request #14408 from panoptix-za/fix_salt_ssh_thinclient_tmp_folder
Handle sudo when re-deploying the shim
|
2014-07-23 11:54:14 -06:00 |
|
Thomas S Hatch
|
7a73418cb3
|
Merge pull request #14403 from panoptix-za/fix_argv_handling_salt_ssh
Fix salt-ssh handling of python os.execv
|
2014-07-23 11:53:25 -06:00 |
|
Thomas S Hatch
|
d7747cc5d0
|
Merge pull request #14400 from panoptix-za/fix_salt_ssh_thinclient_refresh_handling
Improve the handling of errors during salt-ssh refresh of the thin clien...
|
2014-07-23 11:52:09 -06:00 |
|
rallytime
|
e38236d4d7
|
Fix copy-paste
|
2014-07-23 11:47:09 -06:00 |
|
rallytime
|
aaf85bf4ea
|
Add versionadded to new redis modules
|
2014-07-23 11:43:37 -06:00 |
|
Thomas S Hatch
|
c57168e6b4
|
Merge pull request #14391 from adamherzog/fix-apache-state
Fix apache state
|
2014-07-23 11:41:48 -06:00 |
|
Thomas S Hatch
|
fe4b80b3c0
|
Merge pull request #14390 from hvnsweeting/2014.7.state.process
add user and signal args
|
2014-07-23 11:40:19 -06:00 |
|
Joseph Hall
|
b58f0d43fd
|
Merge pull request #14401 from panoptix-za/fix_salt_ssh_thinclient_sudo
This corrects a syntax error for the sudo command,
|
2014-07-23 09:51:18 -06:00 |
|
Stephan Buys
|
2c46a92aa2
|
Fix salt-ssh highstate rendering
|
2014-07-23 10:09:02 +02:00 |
|
Nicole Thomas
|
1fe64fc8d1
|
Merge pull request #14419 from rallytime/pylint_fix
Pylint fix
|
2014-07-22 20:41:10 -06:00 |
|
rallytime
|
7053252eaf
|
Pylint fix
|
2014-07-22 20:39:53 -06:00 |
|
Samuel Smith
|
235b0f5e99
|
Merge pull request #14415 from SmithSamuelM/sam_2014.7
Added support for road estate role attribute in key identity
|
2014-07-22 17:34:02 -06:00 |
|
Samuel M Smith
|
9b0bb227a9
|
Added support for road estate role attribute in key identity
Added tests
|
2014-07-22 17:30:51 -06:00 |
|
David Boucha
|
50eb6c6d74
|
Merge pull request #14412 from terminalmage/update-freezer
Add requests to freezer includes
|
2014-07-22 16:56:11 -06:00 |
|
Erik Johnson
|
a5dcf7c4e2
|
Add requests to freezer includes
This will be required to run 2014.7.x on Windows
|
2014-07-22 17:54:15 -05:00 |
|
Mike Place
|
4c38ca2b65
|
Merge pull request #14411 from rallytime/fix_rhel5_test
Give rhel5 a chance to pass the cache tests
|
2014-07-22 15:50:22 -06:00 |
|
rallytime
|
51c7b95e6f
|
Give rhel5 a chance to pass the cache tests
|
2014-07-22 15:38:54 -06:00 |
|
Stephan Buys
|
b1163906f4
|
Handle sudo when re-deploying the shim
|
2014-07-22 22:38:50 +02:00 |
|
Joseph Hall
|
cf14405ccc
|
Merge pull request #14402 from rallytime/test_cleanup
Remove unnecessary print statement
|
2014-07-22 14:37:25 -06:00 |
|
Joseph Hall
|
d2dc0976ce
|
Merge pull request #14404 from rallytime/fix_proxmox_unused_args
Remove unused arguments in proxmox module
|
2014-07-22 14:36:48 -06:00 |
|
rallytime
|
d77883c4b5
|
Remove unused arguments in proxmox module
|
2014-07-22 13:43:50 -06:00 |
|
Stephan Buys
|
58b0054d2d
|
Fix salt-ssh handling of python os.execv
|
2014-07-22 21:38:10 +02:00 |
|
Stephan Buys
|
7068f288f3
|
This corrects a syntax error for the sudo command, normally 'username -c' is associated with 'su'
|
2014-07-22 21:07:24 +02:00 |
|
Stephan Buys
|
0a3bed9db6
|
Improve the handling of errors during salt-ssh refresh of the thin client.
|
2014-07-22 20:56:42 +02:00 |
|
Thomas S Hatch
|
a364ee6209
|
Merge pull request #14399 from thatch45/2014.7
backport #14388
|
2014-07-22 12:49:04 -06:00 |
|
Thomas S Hatch
|
fb43710550
|
Merge branch 'bp-14388' into 2014.7
|
2014-07-22 12:48:21 -06:00 |
|
vs
|
6dc8d7f0cc
|
dont fail if data.p is empty
|
2014-07-22 12:47:59 -06:00 |
|
Thomas S Hatch
|
313b3874ee
|
Merge pull request #14373 from cachedout/14295
Avoid error in pip uninstall
|
2014-07-22 12:41:51 -06:00 |
|
rallytime
|
a3da60def4
|
Remove unnecessary print statement
|
2014-07-22 12:16:39 -06:00 |
|
Thomas S Hatch
|
ee6811f81c
|
Merge pull request #14385 from whiteinge/salt-rhel-salt-api-init-stop
Fix 'stop' for RedHat salt-api init script
|
2014-07-22 11:50:37 -06:00 |
|
Samuel Smith
|
f8ea2fd2b0
|
Merge pull request #14392 from SmithSamuelM/sam_2014.7
Road Keep cache files now have role field.
|
2014-07-22 09:48:18 -06:00 |
|
Samuel M Smith
|
497218c97b
|
Merge remote-tracking branch 'upstream/2014.7' into sam_2014.7
|
2014-07-22 09:46:55 -06:00 |
|
Adam Herzog
|
cce85a7394
|
Eliminate import of salt.utils.cloud.
|
2014-07-22 08:18:16 -07:00 |
|
Adam Herzog
|
75fbd9a9f9
|
Get rid of unnecessary(?) _check_name.
|
2014-07-22 08:15:14 -07:00 |
|
Joseph Hall
|
3ec7361771
|
Merge pull request #14384 from whiteinge/doc-merge-forward
Updated the contributor documentation with the new branching workflow
|
2014-07-22 09:14:54 -06:00 |
|
Adam Herzog
|
f8fce8c09d
|
Clean up apache.state example usage.
|
2014-07-22 08:13:55 -07:00 |
|
Hung Nguyen Viet
|
71fef692d7
|
add user and signal args
|
2014-07-22 21:50:44 +07:00 |
|
Pedro Algarvio
|
fa2149e1da
|
Allow the VT tests to run on OSX
|
2014-07-22 15:20:03 +01:00 |
|
Seth House
|
95f31c591d
|
Fix 'stop' for RedHat salt-api init script
|
2014-07-21 20:46:26 -06:00 |
|
Seth House
|
94d8fc966e
|
Updated the contributor documentation with the new branching workflow
|
2014-07-21 20:19:33 -06:00 |
|
Samuel M Smith
|
d70ddbb88e
|
Added role field to SaltKeep
|
2014-07-21 19:13:49 -06:00 |
|
Samuel Smith
|
6fe350be54
|
Merge pull request #14381 from SmithSamuelM/sam_2014.7
Added consistent indexing access to remotes by uid, by name, and by ha
Needs Raet v0.2.05
|
2014-07-21 18:01:33 -06:00 |
|
Pedro Algarvio
|
40514dc34c
|
Merge pull request #14378 from rallytime/test_cleanup
Skip lxc tests if no lxc and skip failing vt_test if running osx
|
2014-07-22 00:55:26 +01:00 |
|
Samuel M Smith
|
9b4638c31c
|
Merge remote-tracking branch 'upstream/2014.7' into sam_2014.7
|
2014-07-21 17:51:22 -06:00 |
|
Samuel M Smith
|
89d488cb59
|
Update salt for new remote attributes in Raet
|
2014-07-21 17:50:21 -06:00 |
|
rallytime
|
7bb5ef3773
|
Skip lxc tests if no lxc and skip failing vt_test if running osx
|
2014-07-21 17:11:20 -06:00 |
|
Seth House
|
9c3349b9a4
|
Merge pull request #14375 from rallytime/run_osx_tests
Allow OSX to run tests with change to TMPDIR
|
2014-07-21 14:32:18 -06:00 |
|
rallytime
|
73b185cb72
|
Allow OSX to run tests with change to TMPDIR
|
2014-07-21 14:26:59 -06:00 |
|