Merge pull request #94 from runatlantis/release-0.3.6

Release 0.3.6.
runatlantis · Mar 29, 2018 · 7d181d2 · 7d181d2
2 parents e84ce0b + 3824e3c
commit 7d181d2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,21 @@
+# v0.3.6
+
+## Features
+* `atlantis server -h` has newlines between flags so it's easier to read ([#91](https://github.com/runatlantis/atlantis/issues/91)).
+
+## Bugfixes
+* `atlantis bootstrap` uses a custom ngrok config file so it should work even
+if the user is already running another ngrok tunnel ([#93](https://github.com/runatlantis/atlantis/issues/93)).
+
+## Backwards Incompatibilities / Notes:
+* None
+
+## Downloads
+* [atlantis_darwin_amd64.zip](https://github.com/runatlantis/atlantis/releases/download/v0.3.6/atlantis_darwin_amd64.zip)
+* [atlantis_linux_386.zip](https://github.com/runatlantis/atlantis/releases/download/v0.3.6/atlantis_linux_386.zip)
+* [atlantis_linux_amd64.zip](https://github.com/runatlantis/atlantis/releases/download/v0.3.6/atlantis_linux_amd64.zip)
+* [atlantis_linux_arm.zip](https://github.com/runatlantis/atlantis/releases/download/v0.3.6/atlantis_linux_arm.zip)
+
 # v0.3.5
 
 ## Features

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -104,7 +104,7 @@ func TestLockingExisting(t *testing.T) {
 # Creating a New Release
 1. Update version number in
     1. `main.go`
-1. Update `CHANGELOG.md` with latest release number and information
+1. Update `CHANGELOG.md` with latest release number and information (this URL might be useful: https://github.com/runatlantis/atlantis/compare/v0.3.5...master)
 1. Create a pull request and merge to master
 1. Check out master and fetch latest
 1. Run `make release`

diff --git a/main.go b/main.go
@@ -19,7 +19,7 @@ import (
 	"github.com/spf13/viper"
 )
 
-const atlantisVersion = "0.3.5"
+const atlantisVersion = "0.3.6"
 
 func main() {
 	v := viper.New()