valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
43,840 Commits 24 Branches 182 Tags 341 MiB
7896ceeecd
Commit Graph

43840 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
7896ceeecd Merge pull request #19211 from garethgreenaway/returner_with_profile_fix 
Fixes to returner __init__.py
 2014-12-28 13:01:39 -07:00
Thomas S Hatch
845e123c95 Merge pull request #19174 from jayeshka/kmod_unit_tests 
adding kmod module unit tests
 2014-12-28 13:00:18 -07:00
Thomas S Hatch
adfc818004 Merge pull request #19168 from bechtoldt/user_keys_skip_file 
Enhance ssh.user_keys to skip private key file exports
 2014-12-28 12:58:54 -07:00
Thomas S Hatch
2e24a4fdaa Merge pull request #19165 from thatch45/color_themes 
Color themes
 2014-12-28 12:57:54 -07:00
Gareth J. Greenaway
cbdccb90d7 Only look for a profile in the cfg dict or function if one has been passed. 2014-12-28 09:13:35 -08:00
Joseph Hall
be85f50178 Merge pull request #19245 from manonthemat/develop 
update States Tutorial part 2
 2014-12-24 21:39:39 -07:00
Matthias Sieber
d8af90c611 update States Tutorial part 2 
Explanation of yaml file with matching line numbers
 2014-12-23 16:20:42 -08:00
C. R. Oldham
719cda1ca6 Merge remote-tracking branch 'upstream/2015.2' into develop 2014-12-23 12:06:10 -07:00
C. R. Oldham
bc669152b3 Merge 2014.7 forward to 2015.2 2014-12-23 12:03:49 -07:00
C. R. Oldham
f8f1ee2506 Merge pull request #19182 from cro/eauth_in_django2 
Add ability for Salt to authenticate against Django's ORM.  Git selfie
 2014-12-23 11:52:53 -07:00
Colton Myers
051693c403 Merge branch '2015.2' into develop 2014-12-23 11:37:01 -07:00
Colton Myers
59d9568047 Merge pull request #19227 from basepi/2015.2.release.notes 
Add salt-ssh mine.get to lithium release notes
 2014-12-23 11:36:27 -07:00
Colton Myers
139bd8df5b Add salt-ssh mine to lithium release notes 2014-12-23 11:35:40 -07:00
Colton Myers
321413e638 Rename lithium release notes to 2015.2.0 2014-12-23 11:34:52 -07:00
Thomas S Hatch
cc48140056 Merge pull request #19221 from jacksontj/develop 
Re-submit #19112
 2014-12-23 11:30:44 -07:00
Colton Myers
dc778a8e5e Merge branch '2014.7' into develop 
Conflicts:
	salt/client/ssh/__init__.py
	salt/states/boto_secgroup.py
 2014-12-23 10:57:26 -07:00
Nicole Thomas
230d64eff3 Merge pull request #19223 from rallytime/pylint_fix 
Fix some pylint errors
 2014-12-23 10:24:31 -07:00
Nicole Thomas
4c8ee80d49 Merge pull request #19222 from rallytime/linting 
Add missing import
 2014-12-23 10:24:15 -07:00
C. R. Oldham
2e00a81320 Pylint fix for the pylint fix 2014-12-23 10:23:18 -07:00
rallytime
cd3d1c2684 Fix some pylint errors 2014-12-23 10:14:57 -07:00
rallytime
03073041a9 Add missing import 2014-12-23 10:11:14 -07:00
Thomas Jackson
328f39a52c Re-submit #19112 
Although the PR says it was merged, it wasn't and the reactor is currently broken because of the partial merge of the previous refactor
 2014-12-23 07:46:24 -08:00
Joseph Hall
ddc7930a9b Merge pull request #19218 from grischa/ec2-fix 
fix for salt-specific urlparse
 2014-12-23 05:52:12 -07:00
Grischa Meyer
2c615f2131 fix for salt-specific urlparse 2014-12-23 22:14:15 +11:00
Jayesh
f53666d15a error resolved in kmod unit test case 2014-12-23 14:48:13 +05:30
Arnold Bechtoldt
04c48d4df8 fixing lint error PEP8 E712 2014-12-23 10:16:59 +01:00
Joseph Hall
59622f578d Merge pull request #19208 from hulu/rbenv-wtf 
remove trailing whitespace in rbenv state
 2014-12-22 19:22:00 -07:00
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