valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
31,019 Commits 24 Branches 182 Tags 341 MiB
5eab3db366
Commit Graph

31019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Lustfield
5eab3db366 minor doc touchups 2014-05-24 23:42:00 -05:00
David Boucha
725b8db080 Merge pull request #12997 from internetstaff/develop 
Modified skip flag logic to skip instead of filter.
 2014-05-24 11:46:16 -06:00
David Boucha
a6694bd8da Merge pull request #12670 from eliasp/win_pkg-version-bug 
Reimplemented 'latest_version()' to fix #12663 and make it more readable + better debug-able.
 2014-05-24 11:30:16 -06:00
Joseph Hall
a4701ac4e9 Merge pull request #13017 from crook/aliyun 
Add document for aliyun provider
 2014-05-24 07:59:43 -06:00
Ray Chen
5ecfcad6a1 Forget to submit these files for aliyun documents 2014-05-24 15:38:14 +08:00
Ray Chen
b15c7306b3 Add document for aliyun provider 2014-05-24 15:32:50 +08:00
Pedro Algarvio
283495a14f Merge pull request #12714 from cachedout/ssh_test_runner 
Working salt-ssh test runner
 2014-05-24 02:34:21 +01:00
Pedro Algarvio
bac2e699a9 Merge pull request #13016 from gtmanfred/openstack 
add get_node to the openstack driver namespace
 2014-05-24 02:31:16 +01:00
Daniel Wallace
20a8687ed6 use simple_types_filter for the openstack node object 2014-05-23 20:17:18 -05:00
Daniel Wallace
929e399550 namespace get_node 2014-05-23 19:29:55 -05:00
Thomas S Hatch
9e15a69b30 Merge pull request #13009 from cachedout/12809 
Wrapper func return.
 2014-05-23 17:11:14 -06:00
Mike Place
18fe05ea66 Wrapper func return. 
Not sure why were expecting a tuple here. Looks like a single dict.

This fixes things like grains.items, which were stacktracing.
 2014-05-23 16:02:20 -06:00
Mike Place
c981914800 More Pylint 2014-05-23 15:27:19 -06:00
Thomas S Hatch
8a52bd6b59 Merge pull request #13007 from tligda/develop 
Add Docker grain alongside LXC
 2014-05-23 15:17:10 -06:00
Mike Place
f3733fabf4 Clean up sshd config. 
Remove hostkeys that are now dymaically generated per-run.

No more usepam
 2014-05-23 15:04:11 -06:00
Thomas S Hatch
be657cd191 Merge pull request #13000 from agoragames/add-cwd-argument-for-rvm-module 
Add cwd argument for rvm.do command
 2014-05-23 15:00:32 -06:00
Mike Place
535ea24eea Now we don't need root anymore 2014-05-23 15:00:26 -06:00
Mike Place
d4be5906e0 Pylint 2014-05-23 14:52:28 -06:00
Tom Ligda
d8be67403c Add Docker grain alongside LXC 2014-05-23 13:47:50 -07:00
Mike Place
c753b77e10 Pass -i to salt-ssh 2014-05-23 14:38:52 -06:00
Mike Place
ee652333dd Set this back to the original value. (Fixes salt-ssh bug) 2014-05-23 14:38:17 -06:00
David Czarnecki
b8df9af0ff Fix rvm module test for adding cwd argument 2014-05-23 16:38:04 -04:00
Thomas S Hatch
1d75cf0fd2 Merge pull request #13005 from rallytime/salting_master_docs 
Documentation for salting the salt master
 2014-05-23 14:23:06 -06:00
Thomas S Hatch
998ce76e89 Merge pull request #13004 from KennethWilke/develop 
Improvements to gluster integration
 2014-05-23 14:22:19 -06:00
Mike Place
7abc25f67f Generate server keys too 2014-05-23 14:11:14 -06:00
Mike Place
cf25592c53 Working salt-ssh test runner 
This rounds out initial (alpha) support for a salt-ssh test runner.

At present, one must manually specify the --ssh flag to ensure that
the ssh deamons are spun up properly.

Conflicts:
	tests/integration/__init__.py
	tests/integration/files/conf/_ssh/sshd_config
	tests/integration/files/conf/sshd_config
	tests/integration/files/ext-conf/sshd_config
 2014-05-23 14:11:14 -06:00
rallytime
76340a5c62 Documentation for salting the salt master 2014-05-23 13:50:08 -06:00
KennethWilke
431db4a3e9 Improvements to gluster integration 2014-05-23 14:39:42 -05:00
Thomas S Hatch
9649bbe0f3 Merge pull request #13003 from techhat/syndic 
Remove docs which describe unintentional behavior
 2014-05-23 13:32:21 -06:00
Joseph Hall
b1c1d88d55 Remove docs which describe unintentional behavior 2014-05-23 13:29:46 -06:00
Thomas S Hatch
10502ad415 Merge pull request #13002 from techhat/syndic 
Rewrite syndic topology for clarification
 2014-05-23 13:19:58 -06:00
Joseph Hall
4ad99d822c Rewrite syndic topology for clarification 2014-05-23 13:16:51 -06:00
Thomas S Hatch
cbca9df2d0 Merge pull request #12998 from basepi/syndicdocs 
Clarify some syndic points
 2014-05-23 12:24:06 -06:00
Thomas S Hatch
df38178d14 Merge pull request #12986 from cachedout/12978 
Don't stacktrace if we can't write a job cache.
 2014-05-23 12:21:07 -06:00
Thomas S Hatch
898ce115e1 Merge pull request #12982 from basepi/safeclose10658 
Properly use try-finally for file handle management
 2014-05-23 12:20:25 -06:00
Thomas S Hatch
7120088e50 Merge pull request #12981 from bemehow/quiet_non_errors 
disable confusing [ERROR] printing on retcode!=0 where not relevant
 2014-05-23 12:18:47 -06:00
David Czarnecki
9b4c11b84b Add cwd argument for rvm.do command 
Fixes #11923
 2014-05-23 14:17:58 -04:00
Thomas S Hatch
a4dfe32ced Merge pull request #12976 from diegows/develop 
Options not allowed in tar_options documented
 2014-05-23 12:17:41 -06:00
Thomas S Hatch
74d491130d tell the loader not to load the Semaphore class 2014-05-23 12:14:48 -06:00
Thomas S Hatch
c1b73d1317 Merge pull request #12975 from terminalmage/fix-unavailable-module 
Fix traceback due to unavailable module
 2014-05-23 12:13:10 -06:00
Samuel Smith
141a59a968 Merge pull request #12999 from SmithSamuelM/sam_raet_40 
Updated for RAET v0.0.14
 2014-05-23 12:09:44 -06:00
Samuel M Smith
3c3aa36c0c Merge remote-tracking branch 'upstream/develop' into sam_raet_40 2014-05-23 12:05:19 -06:00
Samuel M Smith
63d67b0912 Updated salt for raet v0.0.14 2014-05-23 12:01:34 -06:00
Thomas S Hatch
e5db465f50 Merge pull request #12962 from dr4Ke/fix_file_directory_clean_symlinks 
file.directory: fix cleaning directory symlinks
 2014-05-23 11:50:48 -06:00
Thomas S Hatch
fb8b418f46 Clean up tomcat fixes per #12889 2014-05-23 11:41:47 -06:00
Thomas S Hatch
cd5818213e Merge pull request #12889 from perdurabo93/patch-1 
Update to tomcat.py
 2014-05-23 11:40:31 -06:00
Thomas S Hatch
77a8232a1f Merge pull request #12994 from terminalmage/issue12172 
Truncate id hash to 10 chars
 2014-05-23 11:30:12 -06:00
Colton Myers
a7741e61a3 Clarify some syndic points 2014-05-23 10:15:59 -06:00
Mike Place
7b61fe48e1 Log instead of being silent. 2014-05-23 10:15:36 -06:00
Colton Myers
eca0117f65 Fix pylint error 2014-05-23 09:43:45 -06:00