David 425
01b4e47356
adding versionadded and fixing minor lint errors
2015-11-24 18:29:49 -08:00
Stephen Woodrow
c695a57ba9
Fix tests.
2015-11-24 18:09:12 -08:00
Stephen Woodrow
ff0e4fa2b9
Allow boto_elb to manage ELB backend policies.
2015-11-24 16:40:44 -08:00
Justin Findlay
345206b68e
Merge pull request #29173 from jfindlay/2015.8
...
add 2015.8.3 release notes
2015-11-24 17:07:51 -07:00
Justin Findlay
212f7dd281
add 2015.8.3 release notes
2015-11-24 17:06:40 -07:00
Justin Findlay
cafbb49cb6
add note on 2015.8.2 release notes
2015-11-24 17:05:41 -07:00
Colton Myers
8d07688af9
Merge pull request #29171 from basepi/merge-forward-develop
...
Merge forward from 2015.8 to develop
2015-11-24 16:53:01 -07:00
Colton Myers
5e88e9e9c0
Merge pull request #29172 from basepi/philips_backport
...
[2015.8] Backport new philips_hue proxy features from develop
2015-11-24 16:52:55 -07:00
Igor
1b75741eed
cleaned up lint errors
2015-11-24 15:52:08 -08:00
Colton Myers
1df6c3083b
Backport new philips_hue proxy features from develop
2015-11-24 16:09:00 -07:00
Colton Myers
28b40de8da
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/client/ssh/__init__.py
salt/client/ssh/ssh_py_shim.py
salt/cloud/clouds/ec2.py
salt/cloud/clouds/vmware.py
salt/grains/philips_hue.py
salt/modules/boto_ec2.py
salt/modules/boto_route53.py
salt/modules/dracr.py
salt/modules/philips_hue.py
salt/proxy/philips_hue.py
salt/states/virtualenv_mod.py
2015-11-24 16:07:31 -07:00
Mike Place
81bf332be4
Migrate pydsl tests to integration test suite
...
This marks the beginning of a migration of the pydsl renderer tests
to the integration test suite and away from the unit test suite.
The unit test approach is becoming too difficult to maintain due to its complex approach to trying to internally manage a highstate run instead of calling into the salt state system to fully manage it.
2015-11-24 15:46:14 -07:00
Colton Myers
2fb1ca0eac
Merge pull request #29167 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-11-24 14:40:34 -07:00
Colton Myers
525f9fbbbb
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
2015-11-24 14:39:48 -07:00
Justin Findlay
a26c10a811
Merge pull request #29164 from jfindlay/bp-29113
...
Backport #29113
2015-11-24 14:26:17 -07:00
Thibault Cohen
69b833d2eb
[Doc] Add note for SVN state
...
Doc addition: SVN state needs subversion package installed
2015-11-24 15:58:49 -05:00
Justin Findlay
363add7131
ssh_known_hosts.present state: catch not found exc
...
Fixes #29111 .
2015-11-24 13:35:42 -07:00
Mark McGuire
50fab35188
kill unneeded import
2015-11-24 13:28:31 -07:00
Igor
e7278cdd7a
cleaned up code to support hosted hipchat server. Added red color for failed runs
2015-11-24 08:37:46 -08:00
Mike Place
68d6c454b8
Merge pull request #29141 from optix2000/full_sls_import
...
Add test case for require: sls with only import statements
2015-11-24 09:17:57 -07:00
Erik Johnson
82e223087e
Work around upstream pygit2 bug
...
See https://github.com/saltstack/salt/issues/28072 and
https://github.com/libgit2/pygit2/issues/583 .
Fixes #28072 .
2015-11-24 10:10:12 -06:00
Mike Place
3326991479
Merge pull request #29027 from makearl/issue-28796-beacon-config-as-list
...
Fix issue 28796 beacon config as list
2015-11-24 09:06:45 -07:00
Mike Place
732f5364a2
Merge pull request #29072 from terminalmage/issue28311
...
Several gitfs/git_pillar fixes
2015-11-24 09:04:39 -07:00
Mike Place
95689ee1a4
Merge pull request #29118 from ticosax/dockerng-network
...
[dockerng] Add networking capabilities
2015-11-24 08:47:36 -07:00
Mike Place
4b4f212d2d
Merge pull request #29145 from alprs/fix-duplicate_import
...
Remove duplicate import of salt.utils.s3
2015-11-24 08:36:05 -07:00
Mike Place
8ddbfd018b
Merge pull request #29136 from cachedout/handle_slack_outage
...
Handle condition where Slack API may be unstable
2015-11-24 08:34:35 -07:00
Mike Place
6079569580
Merge pull request #29148 from lomeroe/boto_route53_create_zone_fix-backport
...
correcting parameter calls to boto get_zone/create_zone functions in …
2015-11-24 08:33:53 -07:00
David 425
a870523a6c
Adding basic control for selinux modules
2015-11-24 07:33:37 -08:00
Mike Place
efdc3cc088
Merge pull request #29149 from lomeroe/boto_route53_create_zone_fix
...
Boto route53 create zone fix
2015-11-24 08:29:46 -07:00
Mike Place
1bb698d4ab
Merge pull request #29150 from sjorge/docs-state-smartos
...
minor doc tweaks for salt.states.smartos
2015-11-24 08:23:49 -07:00
Dmitry Kuzmenko
f20d2aa43e
ACL test update and fixes
2015-11-24 17:35:17 +03:00
Dmitry Kuzmenko
de5890a346
ACL function args: test and fixes
2015-11-24 17:35:17 +03:00
Dmitry Kuzmenko
0dc876d768
Fixed function arguments ACL logic.
2015-11-24 17:35:17 +03:00
Dmitry Kuzmenko
3b9c4d2b35
Fixed LoadAuthTestCase
2015-11-24 17:35:16 +03:00
Dmitry Kuzmenko
a707928529
Minor fix of 'six' usage in ACL function args check
2015-11-24 17:34:57 +03:00
Dmitry Kuzmenko
f75856b920
ACL function arguments: check args and kwargs.
2015-11-24 17:34:44 +03:00
Dmitry Kuzmenko
025de49061
A part of ACL function arguments logic
2015-11-24 17:15:14 +03:00
Nicolas Delaby
e98d18ba41
Expose docker networking as state
2015-11-24 13:55:22 +01:00
Nicolas Delaby
94135d91c3
cosmetic
2015-11-24 13:55:22 +01:00
Nicolas Delaby
17ff5c1ab5
Add expose networking to modules.dockerng
2015-11-24 13:55:22 +01:00
Jorge Schrauwen
8557c9ec42
minor doc tweaks for salt.states.smartos
2015-11-24 12:45:13 +00:00
Ethan Moore
75408ccf99
correcting parameter calls to boto get_zone/create_zone functions in create_zone
...
parameter check on create_zone on private_zone=True
add boto version requirement
2015-11-24 11:54:42 +00:00
Andreas Lutro
e1101bea19
Remove duplicate import of salt.utils.s3
...
Closes #29144
2015-11-24 09:45:31 +01:00
Weilu Jia
596843e8d6
Add test case for sls with only import
...
Tests https://github.com/saltstack/salt/issues/10852
2015-11-23 18:27:56 -08:00
Thomas Desrosiers
e010f2d3b5
Add a range roster for salt-ssh
2015-11-23 20:41:59 -05:00
Thomas Desrosiers
c5eeb77ebc
Add range support to salt-ssh's flat roster
2015-11-23 18:42:45 -05:00
Justin Findlay
4f03196e7d
Merge pull request #29138 from jfindlay/2015.5
...
add 2015.5.8 release notes
2015-11-23 16:22:48 -07:00
Justin Findlay
be045f5cb1
add 2015.5.8 release notes
2015-11-23 16:21:45 -07:00
Mike Place
3ac70a4a8b
Align with test
2015-11-23 14:57:51 -07:00
Mike Place
5e659f1b15
Handle condition where Slack API may be unstable
...
Return simple error message and set result to false
2015-11-23 13:57:06 -07:00