From 352ad3385a2f9686df8bba674cf2595a00181b31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Mon, 22 Sep 2014 12:59:21 +0200
Subject: [PATCH] Updated changelog and package.json to new version 1.8.0

---
 CHANGELOG.md | 4 +++-
 package.json | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69835953dc1..8d28e9223f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,6 @@
-# 1.8.0 (unreleased)
+# 1.8.0 (2014-09-22)
+
+Read this [blog post](http://grafana.org/blog/2014/09/11/grafana-1-8-0-rc1-released.html) for an overview of all improvements.
 
 **Fixes**
 - [Issue #802](https://github.com/grafana/grafana/issues/802). Annotations: Fix when using InfluxDB datasource
diff --git a/package.json b/package.json
index f84ca9cf8c6..8de8f05cf8a 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
     "company": "Coding Instinct AB"
   },
   "name": "grafana",
-  "version": "1.8.0-rc1",
+  "version": "1.8.0",
   "repository": {
     "type": "git",
     "url": "http://github.com/torkelo/grafana.git"