Skip to content

Commit

Permalink
Merge branch 'release/2.1.11'
Browse files Browse the repository at this point in the history
  • Loading branch information
Kotaimen committed May 31, 2019
2 parents 5acc21b + b0021de commit 42297e6
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## Version 2.1.11 (2019-5-31)

Issues:
- Disable custom packed resources to keep template compatiable with awscfncli
and samcli.

## Version 2.1.10 (2019-5-1)

Issues:
Expand Down
8 changes: 1 addition & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,7 @@ The following resource property are supported by `awscfncli` and official
- `Location` parameter for the `AWS::Include` transform
- `SourceBundle` property for the `AWS::ElasticBeanstalk::ApplicationVersion` resource
- `TemplateURL` property for the `AWS::CloudFormation::Stack` resource

The following resource property are supported by `awscfncli`:

- `ApplicationCode` property for the `AWS::KinesisAnalytics::Application`
resource
- `DefinitionString` property for the `AWS::StepFunctions::StateMachine`
resource
- `Command.ScriptLocation` property for the `AWS::Glue::Job` resource

## Config File

Expand Down
4 changes: 2 additions & 2 deletions awscfncli2/runner/runbook/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@ class StepFunctionsDefinitionString(ResourceWithInlineCode):


ADDITIONAL_EXPORT = {
KinesisAnalysisApplicationCode.RESOURCE_TYPE: KinesisAnalysisApplicationCode,
StepFunctionsDefinitionString.RESOURCE_TYPE: StepFunctionsDefinitionString
# KinesisAnalysisApplicationCode.RESOURCE_TYPE: KinesisAnalysisApplicationCode,
# StepFunctionsDefinitionString.RESOURCE_TYPE: StepFunctionsDefinitionString
}

if isinstance(EXPORTS, dict):
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
name='awscfncli2',

# Version and description
version='2.1.10',
version='2.1.11',
description='AWS CloudFormation CLI',
long_description=long_description,

Expand Down

0 comments on commit 42297e6

Please sign in to comment.