Commit Graph

44730 Commits

Author SHA1 Message Date
Mathias Gug
e5ab359bdd Fix style issues. 2015-01-14 16:02:50 -08:00
Mathias Gug
5c631d5915 Remove reference to SQS. 2015-01-14 15:44:50 -08:00
Mathias Gug
6f9fbe23d6 Add boto_sns module and state.
Include integration tests.
2015-01-14 15:43:06 -08: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
rallytime
7ff92cec9a Pylint fix for 2015.2 branch 2015-01-13 10:39:19 -07:00
Thomas S Hatch
80ec40b197 Merge pull request #19689 from rallytime/locale_versionadded
Add versionadded directives to newer locale functions
2015-01-13 08:43:49 -07:00
rallytime
0b96b134dc Add versionadded directives to newer locale functions
Fixes #19607
2015-01-13 08:40:24 -07:00
Thomas S Hatch
231bd75a4e Merge pull request #19688 from rominf/fish-completion
[fish shell completion] adopt for non-interactive usage (e.g. from scripts)
2015-01-13 08:30:51 -07:00
Thomas S Hatch
9d377a97da Merge pull request #19687 from techhat/joyent
Allow joyent api host suffix to be configurable
2015-01-13 08:30:30 -07:00
Thomas S Hatch
2da27f0ddd Merge pull request #19682 from kev009/freebsd-kmods
FreeBSD kmod bugfixes
2015-01-13 08:28:12 -07:00
Thomas S Hatch
a16824ec48 Merge pull request #19680 from jayeshka/cpan-unit-tests
adding cpan test case
2015-01-13 08:26:31 -07:00
Thomas S Hatch
640a717859 Merge pull request #19678 from davidjb/doc-saltfile-ssh
Expand documentation about Saltfile for salt-ssh
2015-01-13 08:26:06 -07:00
Thomas S Hatch
49f98ff858 Merge pull request #19677 from aneeshusa/output-subsystem
Remove obsolete unreferenced tuple of static outputters.
2015-01-13 08:25:36 -07:00
Thomas S Hatch
200a6ea47f Merge pull request #19676 from davidjb/git-error-verbosity
Improve error reporting for failing git module commands
2015-01-13 08:24:55 -07:00
Thomas S Hatch
941eff3854 Merge pull request #19675 from nmadhok/patch-1
Adding missing import so that new caller instance can be instantiated without AttributeError
2015-01-13 08:21:22 -07:00
Thomas S Hatch
ba857d6694 Merge pull request #19672 from elmarshar/patch-2
Update mysql_query.py
2015-01-13 08:19:34 -07:00
Thomas S Hatch
f1391fb8d9 Merge pull request #19667 from cachedout/ssh_tests
Fix tests
2015-01-13 08:14:34 -07:00
Thomas S Hatch
1eb0b4b0e2 Merge pull request #19661 from basepi/sysctlretcode19606
Suppress retcode warnings for systemd enabled check, Fixes #19606
2015-01-13 08:13:15 -07:00