From 737211ffe22ff74de89e99de6f483eb3ad530bf5 Mon Sep 17 00:00:00 2001
From: Emanuel Borsboom <manny@fpcomplete.com>
Date: Mon, 2 May 2016 16:30:19 -0700
Subject: [PATCH] Bump to v1.1.1

and update changelog, LTS version, maintainer guide
---
 ChangeLog.md            |  8 ++++++++
 doc/MAINTAINER_GUIDE.md | 11 ++---------
 stack.cabal             |  2 +-
 stack.yaml              |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index e91ab9515a..4eefdc4582 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -8,6 +8,14 @@ Major changes:
 
 Behavior changes:
 
+Other enhancements:
+
+Bug fixes:
+
+## 1.1.0
+
+Behavior changes:
+
 * Snapshot packages are no longer built with executable profiling. See
   [#1179](https://github.com/commercialhaskell/stack/issues/1179).
 * `stack init` now ignores symlinks when searching for cabal files. It also now
diff --git a/doc/MAINTAINER_GUIDE.md b/doc/MAINTAINER_GUIDE.md
index 4d9ba8cd04..217c5505d9 100644
--- a/doc/MAINTAINER_GUIDE.md
+++ b/doc/MAINTAINER_GUIDE.md
@@ -2,20 +2,13 @@
 
 ## Next release:
 
-* Check that GPG signature for
-  [Releases](https://s3.amazonaws.com/download.fpcomplete.com/debian/dists/jessie/Release)
-  uses SHA512, and close
-  [#1943](https://github.com/commercialhaskell/stack/issues/1934)
 * Integrate FreeBSD binaries and packages
   [#1253](https://github.com/commercialhaskell/stack/issues/1253#issuecomment-185993240)
 
-## Pre-release checks
-
-The following should be tested minimally before a release is considered good
-to go:
+## Pre-release steps
 
 * Ensure `release` and `stable` branches merged to `master`
-* Integration tests pass on a representative Windows, Mac OS X, and Linux (Linux
+* Ensure integration tests pass on a representative Windows, Mac OS X, and Linux (Linux
   is handled by Jenkins automatically): `stack install --pedantic && stack test
   --pedantic --flag stack:integration-tests` . The actual release script will
   perform a more thorough test for every platform/variant prior to uploading, so
diff --git a/stack.cabal b/stack.cabal
index 680ae94a0c..eeb08833c3 100644
--- a/stack.cabal
+++ b/stack.cabal
@@ -1,5 +1,5 @@
 name:                stack
-version:             1.0.5
+version:             1.1.1
 synopsis:            The Haskell Tool Stack
 description:         Please see the README.md for usage information, and
                      the wiki on Github for more details.  Also, note that
diff --git a/stack.yaml b/stack.yaml
index 40aa6945bd..db95276066 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-5.14
+resolver: lts-5.15
 # docker:
 #   enable: true
 #   repo: fpco/stack-full