diff --git a/requirements/base.txt b/requirements/base.txt index af11065033..86742d26e1 100755 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,5 +1,5 @@ boto3~=1.5 -enum34~=1.1 +enum34~=1.1; python_version<"3.4" jsonschema~=2.6 six~=1.11 diff --git a/versions/2016-10-31.md b/versions/2016-10-31.md index f7189794e0..c6b2178750 100644 --- a/versions/2016-10-31.md +++ b/versions/2016-10-31.md @@ -103,7 +103,8 @@ Property Name | Type | Description ---|:---:|--- Handler | `string` | **Required.** Function within your code that is called to begin execution. Runtime | `string` | **Required.** The runtime environment. -CodeUri | `string` | [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). +CodeUri | `string` | [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). +InlineCode | `string` | **Either CodeUri or InlineCode must be specified.** The inline code for the lambda. 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) Description | `string` | Description of the function. MemorySize | `integer` | Size of the memory allocated per invocation of the function in MB. Defaults to 128.