Skip to content

Commit c487006

Browse files
authored
chore: merge pull request #594 from awslabs/1.7.0-patch-release
chore: include enum34 fix and surface inline code docs in v1.7.0 release
2 parents a86d085 + edbcc0d commit c487006

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

requirements/base.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
boto3~=1.5
2-
enum34~=1.1
2+
enum34~=1.1; python_version<"3.4"
33
jsonschema~=2.6
44
six~=1.11
55

versions/2016-10-31.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ Property Name | Type | Description
103103
---|:---:|---
104104
Handler | `string` | **Required.** Function within your code that is called to begin execution.
105105
Runtime | `string` | **Required.** The runtime environment.
106-
CodeUri | `string` <span>&#124;</span> [S3 Location Object](#s3-location-object) | **Required.** S3 Uri or location to the function code. The S3 object this Uri references MUST be a [Lambda deployment package](http://docs.aws.amazon.com/lambda/latest/dg/deployment-package-v2.html).
106+
CodeUri | `string` <span>&#124;</span> [S3 Location Object](#s3-location-object) | **Either CodeUri or InlineCode must be specified.** S3 Uri or location to the function code. The S3 object this Uri references MUST be a [Lambda deployment package](http://docs.aws.amazon.com/lambda/latest/dg/deployment-package-v2.html).
107+
InlineCode | `string` | **Either CodeUri or InlineCode must be specified.** The inline code for the lambda.
107108
FunctionName | `string` | A name for the function. If you don't specify a name, a unique name will be generated for you. [More Info](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-functionname)
108109
Description | `string` | Description of the function.
109110
MemorySize | `integer` | Size of the memory allocated per invocation of the function in MB. Defaults to 128.

0 commit comments

Comments
 (0)