From a1f5347d73a68ed742adddb52d01c0749117285f Mon Sep 17 00:00:00 2001
From: Jacob Wirth <xthexder@live.com>
Date: Tue, 5 May 2015 15:08:37 -0400
Subject: [PATCH] Update version to 1.1.0

---
 CHANGELOG.md | 2 +-
 VERSION      | 2 +-
 api.go       | 5 +++--
 toxiproxy.go | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b694f94f..66fc4d0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 1.1.0 (Unreleased)
+# 1.1.0
 
 * Remove /toxics endpoint in favour of /proxies
 * Add bandwidth toxic
diff --git a/VERSION b/VERSION
index 21e8796a..9084fa2f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.3
+1.1.0
diff --git a/api.go b/api.go
index bbcca141..4101abc9 100644
--- a/api.go
+++ b/api.go
@@ -37,8 +37,9 @@ func (server *server) Listen(host string, port string) {
 	http.Handle("/", r)
 
 	logrus.WithFields(logrus.Fields{
-		"host": host,
-		"port": port,
+		"host":    host,
+		"port":    port,
+		"version": Version,
 	}).Info("API HTTP server starting")
 
 	err := http.ListenAndServe(net.JoinHostPort(host, port), nil)
diff --git a/toxiproxy.go b/toxiproxy.go
index 95846ca5..1ad62bbe 100644
--- a/toxiproxy.go
+++ b/toxiproxy.go
@@ -6,7 +6,7 @@ import (
 	"time"
 )
 
-var Version = "1.0.3"
+var Version = "1.1.0"
 
 var host string
 var port string