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,745 Commits 24 Branches 182 Tags 341 MiB
79daaa5e3e
Commit Graph

44745 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Kuzmenko
79daaa5e3e .flo script based presence test 2015-01-16 09:05:51 +03:00
Dmitry Kuzmenko
637a5aa719 Presenter test using FrameIofloTestCase 2015-01-16 03:39:56 +03:00
Thomas S Hatch
41d0c1a8cd Merge pull request #19759 from garethgreenaway/schedule_until_feature 
Additions to scheduler.
 2015-01-15 15:41:30 -07:00
Mike Place
afb7faaaf1 Merge pull request #19765 from terminalmage/fix-render-logging 
Fix spurious log message
 2015-01-15 14:08:48 -07:00
Erik Johnson
7177fd313c Fix spurious log message 
c65af6a8 introduced a spurious log message in template.py. When a
rendering engine such as yaml, json, etc. which renders to an
OrderedDict is run, the rendered data will not be a StringIO and thus
does not need to be logged. This was the reason for ignoring the
exception.

This commit reverts that change from c65af6a8, and also adds comments
explaining the reasoning for why the exception is being ignored.
 2015-01-15 13:10:12 -06:00
Gareth J. Greenaway
eb8b6c7d77 Typo in documentation 2015-01-15 10:58:28 -08:00
Mike Place
e93be2be61 Merge pull request #19762 from cachedout/fix_event_test 
Fix broken test
 2015-01-15 10:49:14 -07:00
Mike Place
bb3c1714f8 Style fixes 2015-01-15 10:48:44 -07:00
Mike Place
6d14d4e661 Fix broken test 2015-01-15 10:41:08 -07:00
Thomas S Hatch
2fd489d5bf Merge pull request #19750 from techhat/xmark 
Move --set-xmark after iptables jump
 2015-01-15 10:13:27 -07:00
Mike Place
bbecb0f528 Merge pull request #19760 from cachedout/fix_genesis_test 
Fix broken test
 2015-01-15 10:07:03 -07:00
Mike Place
0399fc32c2 Fix broken test 2015-01-15 10:06:28 -07:00
Gareth J. Greenaway
16c69592bd Adding the job name the log message so we know what job was skipped. 2015-01-15 09:04:26 -08:00
Gareth J. Greenaway
afbb0736fc Fixing the versionadded 2015-01-15 08:56:30 -08:00
Gareth J. Greenaway
f6f3e14325 Adding the ability to the salt schedule to specify an "until" option for jobs. 2015-01-15 08:50:24 -08:00
Nicole Thomas
f526f61041 Merge pull request #19684 from jayeshka/chef-unittest 
adding chef unit test case
 2015-01-15 07:57:20 -07:00
Joseph Hall
f42d6974c8 Move --set-xmark after iptables jump 2015-01-14 20:15:14 -07:00
Thomas S Hatch
3a89e67488 Merge pull request #19735 from lyft/add-aws-account-id-function 
Add get_account_id function boto_iam
 2015-01-14 16:20:36 -07:00
Thomas S Hatch
c070a57f8c Merge pull request #19744 from cachedout/doc_fix 
Remove a documentation surprise
 2015-01-14 16:18:15 -07:00
Mike Place
0ac3e624af Remove a documentation surprise 2015-01-14 15:28:40 -07:00
Mathias Gug
97d0f93fd3 Fix coding style. 2015-01-14 13:06:43 -08:00
Mathias Gug
30625a0437 Skip boto_iam integration tests if boto is not available 
or properly configured.
 2015-01-14 11:49:54 -08:00
Mathias Gug
a39df43a48 Fix coding style violations. 2015-01-14 11:49:43 -08:00
Thomas S Hatch
0b6a1ffd3c Merge pull request #19733 from cachedout/pydsl_fixing 
Fix malformed exception handling
 2015-01-14 12:41:23 -07:00
Thomas S Hatch
7041530111 Merge pull request #19725 from rupeshta/firewalld_unit_tests 
test firewalld tests
 2015-01-14 12:18:59 -07:00
Thomas S Hatch
bc639a9f75 Merge pull request #19723 from jayeshka/data_unit_tests 
Added unit test for data
 2015-01-14 12:18:31 -07:00
Thomas S Hatch
4e79364821 Merge pull request #19717 from sjansen/patch-4 
Enable salt-cloud bootstrap with ssh gateway
 2015-01-14 12:15:16 -07:00
Mathias Gug
61eeac5465 Add comment. 2015-01-14 11:12:23 -08:00
Thomas S Hatch
4aae1ec9a4 Merge pull request #19713 from cachedout/runner_doc 
Some docs on runners
 2015-01-14 12:11:45 -07:00
Mathias Gug
3ff36a9692 Add get_account_id function boto_iam 
so that we can retrieve the AWS account id associated with the
credentials used to connect to AWS.
 2015-01-14 11:08:54 -08:00
Mike Place
6a2330a85e Fix malformed exception handling 2015-01-14 11:03:21 -07:00
Nicole Thomas
559c52bf74 Merge pull request #19724 from rupeshta/genesis_unit_tests 
test genesis tests
 2015-01-14 08:17:58 -07:00
Rupesh Tare
2ab5d0bfdf test genesis tests 2015-01-14 16:29:14 +05:30
Rupesh Tare
8dc9287d5d test firewalld tests 2015-01-14 16:26:23 +05:30
Jayesh
a17dfc96fb Added unit test for data 2015-01-14 15:20:16 +05:30
Stuart Jansen
b5d71271a5 Enable salt-cloud bootstrap with ssh gateway 2015-01-13 19:02:40 -07:00
Mike Place
8284f0d6cc Some docs on runners 2015-01-13 16:26:59 -07:00
Nicole Thomas
63e207ee30 Merge pull request #19662 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-01-13 15:23:09 -07:00
Mike Place
8e26499c19 Merge pull request #19704 from cachedout/aes_fix 
Fix key error preventing master start
 2015-01-13 12:49:44 -07:00
Mike Place
3d1f02d1b3 Fix key error preventing master start 2015-01-13 12:49:16 -07:00
Mike Place
e354b69391 Merge pull request #19693 from cachedout/transport_fix 
Fix up transport __init__
 2015-01-13 12:10:15 -07:00
Colton Myers
8363db9d29 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-01-13 12:09:56 -07:00
Colton Myers
9390886412 Merge pull request #19699 from basepi/merge-forward-2015.2 
Merge forward from 2014.7 to 2015.2
 2015-01-13 11:59:45 -07:00
Colton Myers
2a6c9a8165 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	doc/topics/ssh/index.rst
 2015-01-13 11:58:58 -07:00
Mike Place
5c8c7da49d Merge pull request #19696 from cachedout/lint 
More linting
 2015-01-13 11:16:23 -07:00
Mike Place
845271d31c More linting 2015-01-13 11:15:45 -07:00
Mike Place
e04952b58e Merge pull request #19695 from cachedout/more_gitignore 
Ignore some auto-generated files in test dir
 2015-01-13 11:03:25 -07:00
Mike Place
8e504f09d1 Ignore some auto-generated files in test dir 2015-01-13 11:02:52 -07:00
Mike Place
40bc220f1b Fix up transport __init__ 
Fixed style errors, incorrect overriden argspec and missing function
inherited from abstract.

Also reverted import changes which need to be where they were to allow
raet to operate correctly.
 2015-01-13 10:57:09 -07:00
Nicole Thomas
c215532a7f Merge pull request #19692 from rallytime/pylint_fifteen 
Pylint fix for 2015.2 branch
 2015-01-13 10:40:15 -07:00