From a3bcbec286805530042324a48f67b3afb4332359 Mon Sep 17 00:00:00 2001
From: Sriram Madapusi Vasudevan <3770774+TheSriram@users.noreply.github.com>
Date: Tue, 3 Dec 2019 15:09:16 -0800
Subject: [PATCH 1/2] chore: version bump to 0.36.0 (#1632)

---
 samcli/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samcli/__init__.py b/samcli/__init__.py
index cc7774b683..036362771d 100644
--- a/samcli/__init__.py
+++ b/samcli/__init__.py
@@ -2,4 +2,4 @@
 SAM CLI version
 """
 
-__version__ = "0.35.0"
+__version__ = "0.36.0"

From 882d68b4a674f7b18984ecf9ed5bb209071c0a29 Mon Sep 17 00:00:00 2001
From: Shreya <shreyagangishetty@gmail.com>
Date: Tue, 3 Dec 2019 15:28:21 -0800
Subject: [PATCH 2/2] chore: updated functional tests for provisioned
 concurrency support (#1631)

---
 requirements/base.txt                          |  2 +-
 .../function_with_deployment_preference.yaml   | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/requirements/base.txt b/requirements/base.txt
index 4c4d5bcc1c..454be09c9f 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -5,7 +5,7 @@ boto3~=1.10, >=1.10.29
 jmespath~=0.9.4
 PyYAML~=5.1
 cookiecutter~=1.6.0
-aws-sam-translator==1.17.0
+aws-sam-translator==1.18.0
 docker~=4.0
 dateparser~=0.7
 python-dateutil~=2.6, <2.8.1
diff --git a/tests/functional/commands/validate/lib/models/function_with_deployment_preference.yaml b/tests/functional/commands/validate/lib/models/function_with_deployment_preference.yaml
index 19eaa94311..c0d4e44c1c 100644
--- a/tests/functional/commands/validate/lib/models/function_with_deployment_preference.yaml
+++ b/tests/functional/commands/validate/lib/models/function_with_deployment_preference.yaml
@@ -1,3 +1,17 @@
+Parameters:
+  FnName:
+    Type: String
+  ProvisionedConcurrency:
+    Type: String
+    Default: 10
+  EnableAliasProvisionedConcurrency:
+    Type: String
+    AllowedValues:
+      - true
+      - false
+    Default: true
+Conditions:
+  AliasProvisionedConcurrencyEnabled: !Equals [!Ref EnableAliasProvisionedConcurrency, true]
 Resources:
   MinimalFunction:
     Type: 'AWS::Serverless::Function'
@@ -7,4 +21,6 @@ Resources:
       Runtime: python2.7
       AutoPublishAlias: live
       DeploymentPreference:
-        Type: Linear10PercentEvery3Minutes
\ No newline at end of file
+        Type: Linear10PercentEvery3Minutes
+      ProvisionedConcurrencyConfig:
+        ProvisionedConcurrentExecutions: !If [AliasProvisionedConcurrencyEnabled, !Ref ProvisionedConcurrency, !Ref 'AWS::NoValue']