rallytime
|
0075c97846
|
Throw in a 'versionadded' as well
|
2014-07-23 12:24:41 -06:00 |
|
rallytime
|
a1f17e0610
|
Add CLI example to augeas.execute
|
2014-07-23 12:22:51 -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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
Mike Place
|
5986702d9b
|
Avoid error in pip uninstall
Closes #14295
|
2014-07-21 13:50:32 -06:00 |
|
Thomas S Hatch
|
518c54a5a6
|
Merge pull request #14345 from makinacorpus/2014.7
Fix critical filelist infinite loop race
|
2014-07-21 10:06:19 -06:00 |
|
Thomas S Hatch
|
14f4d4516b
|
Merge pull request #14290 from mgwilliams/lxc-check-seed
avoid using test.ping on a non-existent minion
|
2014-07-21 09:43:37 -06:00 |
|
Pedro Algarvio
|
3df3c722d0
|
Merge pull request #14361 from pass-by-value/remove_config_references2
Remove references to deprecated config options
|
2014-07-21 16:09:31 +01:00 |
|
Aditya Kulkarni
|
7e6015fffa
|
Remove references to deprecated config options
|
2014-07-21 10:41:45 -04:00 |
|
Erik Johnson
|
fa24e3c7fe
|
Fix paths in proxyminion example
Default pillar root is /srv/pillar, not /srv/salt/pillar.
|
2014-07-20 18:34:13 -05:00 |
|
Pedro Algarvio
|
d4a66c62b3
|
Merge pull request #14350 from terminalmage/issue14322
Fix unused arguments in S3 external pillar
|
2014-07-20 02:24:47 +01:00 |
|
Erik Johnson
|
4178a6770b
|
Fix unused arguments in S3 external pillar
|
2014-07-19 18:24:59 -05:00 |
|
Pedro Algarvio
|
10c1dba504
|
Merge pull request #14347 from s0undt3ch/2014.7
[Cherrypick from develop] Pylint caller.py
|
2014-07-19 20:09:06 +01:00 |
|
Pedro Algarvio
|
2f79afb8f4
|
"Hide" contextmanager and depends from salt's loader
|
2014-07-19 20:04:45 +01:00 |
|
Pedro Algarvio
|
a2f644d59b
|
Merge pull request #14344 from terminalmage/issue14261
Don't try to look in nonexistant backup dir
|
2014-07-19 17:22:14 +01:00 |
|
Mike Place
|
164b193526
|
Pylint caller.py
|
2014-07-19 13:01:32 +01:00 |
|
Pedro Algarvio
|
55298c39b1
|
Merge pull request #14332 from rallytime/cloud_deprecations
Cloud deprecations for Helium
|
2014-07-19 01:05:45 +01:00 |
|
Erik Johnson
|
ac3d5dca06
|
Don't try to look in nonexistant backup dir
|
2014-07-18 17:17:04 -05:00 |
|
Mathieu Le Marec - Pasquet
|
58bf9f5d1a
|
Fix critical filelist infinite loop race
|
2014-07-19 00:14:18 +02:00 |
|
Pedro Algarvio
|
b6827883e7
|
Merge pull request #14342 from rallytime/fix_unused_boto_kwargs
Removed unused kwarg in boto_elasticache.present
|
2014-07-18 18:41:20 +01:00 |
|