From 53d480c2506757405dd9dcb06dc86da7349da80b Mon Sep 17 00:00:00 2001
From: Michael Barrett <loki77@gmail.com>
Date: Mon, 21 Jan 2019 22:15:40 -0800
Subject: [PATCH] Release 1.6.0

---
 CHANGELOG.md        | 10 ++++++++++
 setup.py            |  2 +-
 stacker/__init__.py |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 380466a1d..e48fc3199 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 ## Upcoming release
 
+## 1.6.0 (2019-01-21)
+
+- New lookup format/syntax, making it more generic [GH-665]
+- Allow lowercase y/Y when prompted [GH-674]
+- Local package sources [GH-677]
+- Add `in_progress` option to stack config [GH-678]
+- Use default ACL for uploaded lambda code [GH-682]
+- Display rollback reason after error [GH-687]
+- ssm parameter types [GH-692]
+
 ## 1.5.0 (2018-10-14)
 
 The big feature in this release is the introduction of "targets" which act as
diff --git a/setup.py b/setup.py
index 0a12e6680..c3966c206 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 from setuptools import setup, find_packages
 
 
-VERSION = "1.5.0"
+VERSION = "1.6.0"
 
 src_dir = os.path.dirname(__file__)
 
diff --git a/stacker/__init__.py b/stacker/__init__.py
index aa813611b..213a08f64 100644
--- a/stacker/__init__.py
+++ b/stacker/__init__.py
@@ -2,4 +2,4 @@
 from __future__ import division
 from __future__ import absolute_import
 
-__version__ = "1.5.0"
+__version__ = "1.6.0"