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
43,857 Commits 24 Branches 182 Tags 341 MiB
e5fb81970d
Commit Graph

43857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
e5fb81970d Attempt to fix inconsintent VT test by preventing a spin 2014-12-29 10:26:48 -07:00
Mike Place
d8221e6152 Merge pull request #19279 from cachedout/highstate_output_bug 
Fix typo in highstate outputter
 2014-12-29 10:05:01 -07:00
Mike Place
9d8a80e225 Fix typo in highstate outputter 2014-12-29 10:04:11 -07:00
Thomas S Hatch
2b09c75702 Merge pull request #19267 from jfindlay/ref_req 
move requirements files into requirements dir
 2014-12-28 13:50:03 -07:00
Thomas S Hatch
846c78eca1 Merge pull request #19261 from manonthemat/develop 
documentation fix: environ.set -> environ.setenv
 2014-12-28 13:47:45 -07:00
Thomas S Hatch
7c85a70db9 Merge pull request #19254 from jacksontj/multi_syndic 
Fix for:  TypeError: pub() got multiple values for keyword argument 'user'
 2014-12-28 13:42:16 -07:00
Thomas S Hatch
e098828770 Merge pull request #19247 from Nikerabbit/ordering 
Fix execution order with "names" in relation to other states
 2014-12-28 13:38:13 -07:00
Thomas S Hatch
35bdc30f5c Merge pull request #19241 from jacksontj/develop 
Python3 compat iterator
 2014-12-28 13:31:47 -07:00
Thomas S Hatch
763c0f600a Merge pull request #19217 from jayeshka/hosts_unit_tests 
Hosts unit tests
 2014-12-28 13:06:47 -07:00
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
Justin Findlay
ad33589fac move requirements files into requirements dir 2014-12-27 17:29:03 -07:00
manonthemat
cd47b6da86 environ.set -> environ.setenv 2014-12-26 15:39:06 -08:00
Thomas Jackson
e709e66a7b Convert last remaining cases of generating JID manually with utils function 2014-12-25 00:01:15 -08:00
Thomas Jackson
ee82031c54 Python 3 compat iterator 2014-12-25 00:01:15 -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
Thomas Jackson
74aa626ca4 Fix a seeming merge-conflict in syndic 
Since we already add "user" above, this just causes it to be sent twice
 2014-12-24 14:08:41 -08:00
Niklas Laxström
cd74eb8181 Fix execution order with "names" 
Fixes #13312. Used fractional parts of floats to ensure correct sort
order. The issue with previous solution to use order + name_order was
that all states come with preassigned order, and thus order + name_order
will match the order of the following states. This solution limits the
maximum value of name_order to 9999 before the same issue arises again.

I don't quite understand why the order_chunks function is duplicated
twice. I updated both instances.
 2014-12-24 15:19:14 +02: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
92f36aa396 adding hosts unit test 2014-12-23 15:43:17 +05:30
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
Jayesh
050e454167 adding hosts unit test case 2014-12-23 11:53:19 +05:30
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