Commit Graph

65153 Commits

Author SHA1 Message Date
Winston Liu
19bbf51a2e resourcepath -> resourcePath for consistency naming. 2016-02-11 13:26:05 -08:00
kbelov
b2e4de9a9c fixed mapping template in the method request integration to support identity fields 2016-02-11 10:43:02 -08:00
Winston Liu
59aaec3b4c fixed lint warnings. 2016-02-11 08:38:29 -08:00
Winston Liu
824960503c lint warnings/errors. 2016-02-10 15:05:53 -08:00
Winston Liu
7df27fe0c9 Merge branch 'boto_cognitoidentity' into boto_apigateway 2016-02-10 13:00:30 -08:00
Winston Liu
ed7e26fa13 oops, missed this unused import. 2016-02-10 12:07:03 -08:00
Winston Liu
4ee6c93838 fixed lint warnings/errors. 2016-02-10 11:43:47 -08:00
Winston Liu
efc374f968 'comment' fix up's in the returned dictionary. 2016-02-10 09:42:14 -08:00
Winston Liu
7ae0f8d7e6 fixed few lint warnings. 2016-02-10 09:23:19 -08:00
Winston Liu
054231605d minor fix up on if conditions. 2016-02-10 08:52:48 -08:00
Winston Liu
d8a6a32865 Merge branch 'boto_cognitoidentity' into boto_apigateway 2016-02-10 08:26:11 -08:00
Winston Liu
6df88a73db added helper function to look up pillar for SupportedLoginProviders and OpenIdConnectProviderARNs if the input into pool_present for these parameters were of string_types. 2016-02-10 08:25:51 -08:00
Winston Liu
f21ebbd096 Merge branch 'boto_cognitoidentity' into boto_apigateway 2016-02-09 16:57:57 -08:00
Winston Liu
ce206c1e28 present and absent states added for cognito identity pool. 2016-02-09 16:54:05 -08:00
Winston Liu
248707069c cleaned up a few naming inconsistencies. 2016-02-09 16:52:51 -08:00
Winston Liu
6952e57b4c few doc mod's. 2016-02-08 15:22:51 -08:00
Winston Liu
f3259b70fd boto_lambda -> boto_cognitoidentity in comments and error msgs. 2016-02-08 08:28:53 -08:00
Winston Liu
f0ede44345 added execution module and unit tests for AWS Cognito Identity service. 2016-02-05 18:57:13 -08:00
Kris Raney
e433f15875 Merge branch 'develop' into boto_apigateway 2016-01-29 11:08:32 -06:00
Nicole Thomas
1f531c6561 Merge pull request #30701 from kraney/boto_cloudtrail
Catch errors that were ignored in cloud trail state updates.
2016-01-29 09:52:45 -07:00
Nicole Thomas
486be7c78c Merge pull request #30721 from sjorge/module-vmadm
vmadm.list should have keyed=True as default!
2016-01-29 08:58:42 -07:00
Colton Myers
a2c260e701 Merge pull request #30648 from twangboy/mac_power
Fixed _validate_enabled function
2016-01-28 17:29:36 -07:00
Joseph Hall
4942804bf1 Merge pull request #30714 from wise0wl/develop
Added networks option to Joyent cloud provider, allowing for selectio…
2016-01-28 17:22:21 -07:00
Christopher Dickey
63dfd1a23a Added safer .get method to vm_ 'networks' dictionary 2016-01-28 15:27:51 -08:00
twangboy
602389f171 Added handling for string on and off 2016-01-28 16:02:46 -07:00
Jorge Schrauwen
1759d867db vmadm.list should have keyed=True as default! 2016-01-28 22:30:43 +00:00
Kris Raney
a9ee77a011 Another missed error check 2016-01-28 16:15:03 -06:00
Kris Raney
b4d27451d1 Merge branch 'develop' into boto_apigateway 2016-01-28 15:35:34 -06:00
Nicole Thomas
2890480700 Merge pull request #30712 from techhat/novnc
Disable VNC by default
2016-01-28 13:47:16 -07:00
Kris Raney
d113111886 Fix cut-and-paste error or whatever it was 2016-01-28 14:41:15 -06:00
twangboy
a520733a9b Fixed syntax error in _validate_enabled 2016-01-28 12:49:08 -07:00
twangboy
a1bfcafba6 Fixed _valideate_enabled function 2016-01-28 12:49:07 -07:00
Christopher Dickey
feab016501 Added networks option to Joyent cloud provider, allowing for selection of Networks other than default 2016-01-28 11:46:59 -08:00
Joseph Hall
c71756ab46 Disable VNC by default 2016-01-28 11:59:04 -07:00
Nicole Thomas
67b20728d2 Merge pull request #30709 from michalsuba/patch-2
exposing name of password column from module
2016-01-28 11:26:37 -07:00
Nicole Thomas
604cef23c1 Merge pull request #30708 from michalsuba/patch-1
Addressing user creation on mysql 5.7
2016-01-28 11:25:42 -07:00
Michal Suba
727c1384bd exposing name of password column from module
in addition to https://github.com/saltstack/salt/pull/30603
and https://github.com/saltstack/salt/pull/30708
2016-01-28 18:48:26 +01:00
Michal Suba
6a115f271c Addressing user creation on mysql 5.7
After creating user on mysql 5.7, check fails. This should work in addition to changes mentioned in  https://github.com/saltstack/salt/issues/29265 .
2016-01-28 18:40:15 +01:00
Nicole Thomas
1329d21dc0 Merge pull request #30702 from kraney/boto_s3_bucket
Further fix for #30544
2016-01-28 09:32:48 -07:00
Nicole Thomas
43be48ae78 Merge pull request #30693 from ankitforcode/fix_volume_creation_amazon_boto_lc
Updated Documentation and Example for creating volume in launch_config when using boto
2016-01-28 09:06:20 -07:00
Kris Raney
9f7034ae35 Further fix for #30544
When versioning is unspecified, still had an error for brand new buckets.
2016-01-28 09:37:05 -06:00
Kris Raney
c1f7a9b21b Catch errors that were ignored in cloud trail state updates. Fix bug discovered as a result - was not passing authentication information to _get_trail_arn, causing it to work with the awscli configuration rather than the salt specific one. 2016-01-28 09:31:17 -06:00
ankitforcode
9f2a68d99b Updated Documentation and Example for creating volume in launch_config when using boto 2016-01-28 14:49:35 +05:30
Colton Myers
642bc65e9f Merge pull request #30683 from s0undt3ch/issues/py26-deepcopy-fix
Allow deepcopies of NamespacedDictWrapper in python 2.6
2016-01-27 16:59:04 -07:00
Colton Myers
9b28b09fde Merge pull request #30634 from MorphBonehunter/develop
Renaming salt-ssh option and documentation fix
2016-01-27 16:50:11 -07:00
Colton Myers
00983b809b Merge pull request #30660 from invsblduck/revert_issue_21084
Revert service.mod_watch() bug introduced in Issue 21084
2016-01-27 15:49:37 -07:00
Colton Myers
0ee078eaf1 Merge pull request #30647 from terminalmage/issue11304
Allow custom types to sync to the master
2016-01-27 15:35:01 -07:00
Daniel Wendler
32b71239e7 Extend deprecation warning until Nitrogen
Show the wipe_ssh deprecation warning until Nitrogen is released.
2016-01-27 22:50:14 +01:00
Colton Myers
c15999edd9 Merge pull request #30428 from davisj/pillar_cache
Add pillar_cache functionality to minion.
2016-01-27 14:28:08 -07:00
Erik Johnson
36cd3f3c4c Revert saltenv='base' changes
These were unintentional.
2016-01-27 15:14:31 -06:00