Merge branch 'master' into examples-docs

2017-10-16 12:07:05 -07:00 · 2017-10-16 12:07:05 -07:00 · 734acd9935
parent c9e6ffa91c fa5c6d2e80
commit 734acd9935
2 changed files with 2 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,6 @@
 ## (UNRELEASED)

-## 1.1.0 (October 13, 2017)
+## 1.1.1 (October 13, 2017)

 ### IMPROVEMENTS:

--- a/website/source/intro/getting-started/build-image.html.md
+++ b/website/source/intro/getting-started/build-image.html.md
@ -210,6 +210,7 @@ WELCOME TO PACKER!

 Create a file named `example.sh` and add the following:

+
 ```bash
 #!/bin/bash
 echo "hello"