Skip to content

Commit

Permalink
Merge branch 'release-1.10.82'
Browse files Browse the repository at this point in the history
* release-1.10.82:
  Bumping version to 1.10.82
  Update to latest models
  • Loading branch information
awstools committed Aug 21, 2018
2 parents d1e8646 + 75f61f0 commit 0dfd61f
Show file tree
Hide file tree
Showing 8 changed files with 63 additions and 15 deletions.
22 changes: 22 additions & 0 deletions .changes/1.10.82.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[
{
"category": "``ec2``",
"description": "Update ec2 client to latest version",
"type": "api-change"
},
{
"category": "``dlm``",
"description": "Update dlm client to latest version",
"type": "api-change"
},
{
"category": "``rds``",
"description": "Update rds client to latest version",
"type": "api-change"
},
{
"category": "``elasticbeanstalk``",
"description": "Update elasticbeanstalk client to latest version",
"type": "api-change"
}
]
9 changes: 9 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@
CHANGELOG
=========

1.10.82
=======

* api-change:``ec2``: Update ec2 client to latest version
* api-change:``dlm``: Update dlm client to latest version
* api-change:``rds``: Update rds client to latest version
* api-change:``elasticbeanstalk``: Update elasticbeanstalk client to latest version


1.10.81
=======

Expand Down
2 changes: 1 addition & 1 deletion botocore/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import re
import logging

__version__ = '1.10.81'
__version__ = '1.10.82'


class NullHandler(logging.Handler):
Expand Down
12 changes: 6 additions & 6 deletions botocore/data/dlm/2018-01-12/service-2.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
},
"PolicyDetails":{
"shape":"PolicyDetails",
"documentation":"<p>The configuration of the lifecycle policy.</p> <p>Target tags cannot be re-used across lifecycle policies.</p>"
"documentation":"<p>The configuration details of the lifecycle policy.</p> <p>Target tags cannot be re-used across lifecycle policies.</p>"
}
}
},
Expand Down Expand Up @@ -198,13 +198,13 @@
},
"TargetTags":{
"shape":"TargetTagsFilterList",
"documentation":"<p>The target tags.</p> <p>Tags are strings in the format <code>key:value</code>.</p>",
"documentation":"<p>The target tag for a policy.</p> <p>Tags are strings in the format <code>key=value</code>.</p>",
"location":"querystring",
"locationName":"targetTags"
},
"TagsToAdd":{
"shape":"TagsToAddFilterList",
"documentation":"<p>The tags to add to the resources.</p> <p>Tags are strings in the format <code>key:value</code>.</p> <p>These tags are added in addition to the AWS-added lifecycle tags.</p>",
"documentation":"<p>The tags to add to objects created by the policy.</p> <p>Tags are strings in the format <code>key=value</code>.</p> <p>These user-defined tags are added in addition to the AWS-added lifecycle tags.</p>",
"location":"querystring",
"locationName":"tagsToAdd"
}
Expand Down Expand Up @@ -373,11 +373,11 @@
},
"TargetTags":{
"shape":"TargetTagList",
"documentation":"<p>The target tags.</p>"
"documentation":"<p>The single tag that identifies targeted resources for this policy.</p>"
},
"Schedules":{
"shape":"ScheduleList",
"documentation":"<p>The schedule.</p>"
"documentation":"<p>The schedule of policy-defined actions.</p>"
}
},
"documentation":"<p>Specifies the configuration of a lifecycle policy.</p>"
Expand Down Expand Up @@ -435,7 +435,7 @@
},
"TagsToAdd":{
"shape":"TagsToAddList",
"documentation":"<p>The tags to add to policy-created resources. These tags are added in addition to the default lifecycle tags.</p>"
"documentation":"<p>The tags to apply to policy-created resources. These user-defined tags are in addition to the AWS-added lifecycle tags.</p>"
},
"CreateRule":{
"shape":"CreateRule",
Expand Down
7 changes: 7 additions & 0 deletions botocore/data/ec2/2016-11-15/service-2.json
Original file line number Diff line number Diff line change
Expand Up @@ -14739,6 +14739,13 @@
"t2.large",
"t2.xlarge",
"t2.2xlarge",
"t3.nano",
"t3.micro",
"t3.small",
"t3.medium",
"t3.large",
"t3.xlarge",
"t3.2xlarge",
"m1.small",
"m1.medium",
"m1.large",
Expand Down
18 changes: 11 additions & 7 deletions botocore/data/elasticbeanstalk/2010-12-01/service-2.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
{"shape":"TooManyBucketsException"},
{"shape":"TooManyConfigurationTemplatesException"}
],
"documentation":"<p>Creates a configuration template. Templates are associated with a specific application and are used to deploy different versions of the application with the same configuration settings.</p> <p>Related Topics</p> <ul> <li> <p> <a>DescribeConfigurationOptions</a> </p> </li> <li> <p> <a>DescribeConfigurationSettings</a> </p> </li> <li> <p> <a>ListAvailableSolutionStacks</a> </p> </li> </ul>"
"documentation":"<p>Creates a configuration template. Templates are associated with a specific application and are used to deploy different versions of the application with the same configuration settings.</p> <p>Templates aren't associated with any environment. The <code>EnvironmentName</code> response element is always <code>null</code>.</p> <p>Related Topics</p> <ul> <li> <p> <a>DescribeConfigurationOptions</a> </p> </li> <li> <p> <a>DescribeConfigurationSettings</a> </p> </li> <li> <p> <a>ListAvailableSolutionStacks</a> </p> </li> </ul>"
},
"CreateEnvironment":{
"name":"CreateEnvironment",
Expand Down Expand Up @@ -1045,27 +1045,31 @@
},
"Nice":{
"shape":"NullableDouble",
"documentation":"<p>Percentage of time that the CPU has spent in the <code>Nice</code> state over the last 10 seconds.</p>"
"documentation":"<p>Available on Linux environments only.</p> <p>Percentage of time that the CPU has spent in the <code>Nice</code> state over the last 10 seconds.</p>"
},
"System":{
"shape":"NullableDouble",
"documentation":"<p>Percentage of time that the CPU has spent in the <code>System</code> state over the last 10 seconds.</p>"
"documentation":"<p>Available on Linux environments only.</p> <p>Percentage of time that the CPU has spent in the <code>System</code> state over the last 10 seconds.</p>"
},
"Idle":{
"shape":"NullableDouble",
"documentation":"<p>Percentage of time that the CPU has spent in the <code>Idle</code> state over the last 10 seconds.</p>"
},
"IOWait":{
"shape":"NullableDouble",
"documentation":"<p>Percentage of time that the CPU has spent in the <code>I/O Wait</code> state over the last 10 seconds.</p>"
"documentation":"<p>Available on Linux environments only.</p> <p>Percentage of time that the CPU has spent in the <code>I/O Wait</code> state over the last 10 seconds.</p>"
},
"IRQ":{
"shape":"NullableDouble",
"documentation":"<p>Percentage of time that the CPU has spent in the <code>IRQ</code> state over the last 10 seconds.</p>"
"documentation":"<p>Available on Linux environments only.</p> <p>Percentage of time that the CPU has spent in the <code>IRQ</code> state over the last 10 seconds.</p>"
},
"SoftIRQ":{
"shape":"NullableDouble",
"documentation":"<p>Percentage of time that the CPU has spent in the <code>SoftIRQ</code> state over the last 10 seconds.</p>"
"documentation":"<p>Available on Linux environments only.</p> <p>Percentage of time that the CPU has spent in the <code>SoftIRQ</code> state over the last 10 seconds.</p>"
},
"Privileged":{
"shape":"NullableDouble",
"documentation":"<p>Available on Windows environments only.</p> <p>Percentage of time that the CPU has spent in the <code>Privileged</code> state over the last 10 seconds.</p>"
}
},
"documentation":"<p>CPU utilization metrics for an instance.</p>"
Expand Down Expand Up @@ -2047,7 +2051,7 @@
"members":{
"InstanceHealthList":{
"shape":"InstanceHealthList",
"documentation":"<p>Detailed health information about each instance.</p>"
"documentation":"<p>Detailed health information about each instance.</p> <p>The output differs slightly between Linux and Windows environments. There is a difference in the members that are supported under the <code>&lt;CPUUtilization&gt;</code> type.</p>"
},
"RefreshedAt":{
"shape":"RefreshedAt",
Expand Down
6 changes: 6 additions & 0 deletions botocore/data/rds/2014-10-31/paginators-1.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,12 @@
"limit_key": "NumberOfLines",
"more_results": "AdditionalDataPending",
"result_key": "LogFileData"
},
"DescribeDBClusters": {
"input_token": "Marker",
"limit_key": "MaxRecords",
"output_token": "Marker",
"result_key": "DBClusters"
}
}
}
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
# The short X.Y version.
version = '1.10.'
# The full version, including alpha/beta/rc tags.
release = '1.10.81'
release = '1.10.82'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down

0 comments on commit 0dfd61f

Please sign in to comment.