valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
44,013 Commits 24 Branches 182 Tags 341 MiB
e595b3b8f4
Commit Graph

44013 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joseph Hall
40d4720554 Merge pull request #19209 from hulu/ec2-urlparse-broken 
fix urlparse references in salt.cloud.clouds.ec2
 2014-12-22 19:21:35 -07:00
Joseph Hall
c071f6e2b2 Merge pull request #19210 from hulu/fix-exitcodes 
replace broken salt.exitcodes refs with salt.defaults.exitcodes
 2014-12-22 19:17:34 -07:00
Chris Rebert
decdc54cab replace broken salt.exitcodes refs with salt.defaults.exitcodes 2014-12-22 18:02:18 -08:00
Chris Rebert
157bd35173 fix urlparse references in salt.cloud.clouds.ec2 2014-12-22 17:57:25 -08:00
Chris Rebert
e8e3a1df02 remove trailing whitespace in rbenv state 2014-12-22 17:48:05 -08:00
Thomas S Hatch
6a942532dd Merge pull request #19207 from whiteinge/doc-key-urls-version 
Added missing versionadded directives for the /key URLs
 2014-12-22 18:00:00 -07:00
Thomas S Hatch
7f2df0df7a Merge pull request #19206 from basepi/salt-ssh-mine-7903 
Add support for mine.get in salt-ssh
 2014-12-22 17:59:40 -07:00
Thomas S Hatch
8c8c5473eb Merge pull request #19202 from basepi/salt-ssh.tty.scp 
Fix for salt-ssh with tty enabled
 2014-12-22 17:55:01 -07:00
Thomas S Hatch
91176d5320 Merge pull request #19192 from basepi/merge-forward 
Merge forward from 2014.7 to develop
 2014-12-22 17:38:07 -07:00
Thomas S Hatch
d779ee1fba Merge pull request #19170 from cedwards/kafka_returner 
Initial commit - kafka returner
 2014-12-22 17:20:51 -07:00
Thomas S Hatch
fec284310c Merge pull request #19169 from thepauleh/dis-repo-19021 
19021 Pass Repo Options into refresh_db
 2014-12-22 17:19:47 -07:00
C. R. Oldham
31f5c7ab79 Pylint fix 2014-12-22 17:08:11 -07:00
Thomas S Hatch
cb7e8c0489 Merge pull request #19163 from terminalmage/issue18867 
Fix regression in __pillar__ dunder
 2014-12-22 16:36:44 -07:00
Thomas S Hatch
8e4d9f2dcb Merge pull request #19154 from lyft/more-boto-secgroup-fixes 
Fix for boto_secgroup state to properly support lists for cidrs, group i...
 2014-12-22 16:35:21 -07:00
Thomas S Hatch
334f1f89f0 Merge pull request #19150 from rallytime/bp-19134 
Backport #19134 to 2014.7
 2014-12-22 16:35:06 -07:00
Thomas S Hatch
e530ba9c72 Merge pull request #19147 from inthecloud247/patch-14 
update rbenv docs/example to work on Ubuntu/Debian
 2014-12-22 16:34:43 -07:00
Thomas S Hatch
5e2473cf43 Merge pull request #19144 from rallytime/bp-19116 
Backport #19116 to 2014.7
 2014-12-22 16:34:07 -07:00
Seth House
f3d936fb2f Added missing versionadded directives for the /key URLs 
Doh. My bad.
 2014-12-22 16:33:26 -07:00
Thomas S Hatch
d2469d3433 Merge pull request #19074 from grischa/ec2-fix 
fix ec2 cloud provider for endpoint URLs with paths
 2014-12-22 16:32:57 -07:00
Colton Myers
f2fd892dc5 Merge pull request #19145 from whiteinge/sphinx-fixups 
Minor Sphinx fixups
 2014-12-22 16:25:01 -07:00
Colton Myers
a5d7c8a8d2 Fix typo 2014-12-22 16:07:31 -07:00
Colton Myers
586b834154 Use faster random filename generation 2014-12-22 15:41:12 -07:00
Samuel Smith
76157bc038 Merge pull request #19198 from SmithSamuelM/sam_20141222 
Fixed bug where checking HAS_ZMQ instead of opts['transport'] == 'zeromq...
 2014-12-22 15:31:08 -07:00
Samuel M Smith
b9c86c280c Fixed bug where checking HAS_ZMQ instead of opts['transport'] == 'zeromq' 2014-12-22 15:29:55 -07:00
Colton Myers
9700f4add9 Use NamedTemporaryFile 2014-12-22 15:17:38 -07:00
Colton Myers
5ad67a1229 Fix typo (cachedir, not cache_dir) 2014-12-22 15:04:39 -07:00
Colton Myers
67cff17039 Copy the shim to the target system to execute if tty is enabled 2014-12-22 14:38:01 -07:00
Colton Myers
7fc1cc2ba2 Merge branch '2014.7' into merge-forward 
Conflicts:
	doc/topics/releases/2014.7.1.rst
	salt/modules/mdadm.py
	salt/modules/mine.py
	salt/modules/win_firewall.py
	salt/modules/win_groupadd.py
	salt/modules/win_service.py
	salt/modules/win_system.py
	salt/modules/win_useradd.py
	salt/runners/jobs.py
	tests/unit/modules/mdadm_test.py
 2014-12-22 13:33:53 -07:00
Samuel Smith
7738ae2cad Merge pull request #19189 from SmithSamuelM/sam_20141222 
Corrected invalid parameter name in RaetKey method
 2014-12-22 13:14:34 -07:00
Samuel M Smith
aac9d2f2fb Corrected invalide parameter name in RaetKey method 2014-12-22 13:11:45 -07:00
Samuel Smith
21c413c363 Merge pull request #19187 from SmithSamuelM/sam_20141222 
removed debug line
 2014-12-22 13:05:52 -07:00
Samuel M Smith
1bb0d537ca removed debug line 2014-12-22 13:04:46 -07:00
Samuel Smith
318a220872 Merge pull request #19185 from SmithSamuelM/sam_20141222 
Pub commands are now filtered by RAET presence in router.
 2014-12-22 13:00:36 -07:00
Samuel M Smith
ca878d8f8d Pub commands are not filtered by RAET presence in router. LIst is minions is filtered by the set of available minions 2014-12-22 12:56:29 -07:00
Nicole Thomas
6482552ec1 Merge pull request #19181 from rallytime/pylints 
String formatting fix
 2014-12-22 12:34:19 -07:00
Colton Myers
68884e492d Execute the mine function from the FunctionWrapper object 2014-12-22 12:26:03 -07:00
Samuel Smith
4390f1658a Merge pull request #19183 from SmithSamuelM/sam_20141222 
Fixed bug in client. Needs parens on if logic (and not on both or clause...
 2014-12-22 11:57:09 -07:00
Samuel M Smith
5fc7ce2ed3 Fixed bug in client. Needs parens on if logic (and not on both or clauses unless parens) 2014-12-22 11:53:50 -07:00
C. R. Oldham
8c9587e10c More pylint 2014-12-22 11:46:01 -07:00
C. R. Oldham
9f696a2e1b Handle initial django setup differently and fix pylint 2014-12-22 11:24:55 -07:00
C. R. Oldham
557d31334f Add ability to retrieve authentication from the Django ORM. 2014-12-22 11:24:36 -07:00
C. R. Oldham
0cf56eaff4 More additions to django eauth 2014-12-22 11:24:27 -07:00
C. R. Oldham
98965d6dd9 First cut at eauth via django 2014-12-22 11:24:16 -07:00
rallytime
dde0877e9c String formatting fix 2014-12-22 10:31:49 -07:00
Thomas S Hatch
6579d447ae Merge pull request #19175 from rupeshta/pw_group_unit_tests 
added unit test cases for pw_group module
 2014-12-22 09:37:32 -07:00
Thomas S Hatch
daf782d2a9 Merge pull request #19153 from rallytime/windows_pkg_docs 
Update the windows package to correct one: 2014.7.0 --> 2014.7.0-1
 2014-12-22 09:24:10 -07:00
Thomas S Hatch
052f90e47c Merge pull request #19143 from rallytime/bp-19079 
Backport #19079 to 2014.7
 2014-12-22 09:19:53 -07:00
Thomas S Hatch
f0924b6ce5 Merge pull request #19139 from rallytime/bp-19051 
Backport #19051 to 2014.7
 2014-12-22 09:19:14 -07:00
Thomas S Hatch
b8b8eb437f Merge pull request #19129 from nmadhok/unit-tests 
Adding unit tests for zfs.exists and zfs.create [WIP]
 2014-12-22 09:17:35 -07:00
Thomas S Hatch
66067dd686 Merge pull request #19179 from thatch45/Lacrymology-safe-pillar-get 
Merge #19122 with config change
 2014-12-22 09:16:47 -07:00