From 381274868299d9b76cdf2c752c42c2f9e80f9c7d Mon Sep 17 00:00:00 2001
From: hagen1778 <hagen1778@gmail.com>
Date: Thu, 31 May 2018 01:08:20 +0300
Subject: [PATCH] update version to 1.5.0

---
 CHANGELOG.md      | 10 ++++++++++
 dist/CHANGELOG.md | 10 ++++++++++
 dist/plugin.json  |  2 +-
 src/plugin.json   |  2 +-
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90c0f6c0d..674750dc7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# 1.5.0 (2018-05-31)
+
+## New Features
+
+* new datasource setting - `default database`. If set it will be prefilled in the query builder, and used to make ad-hoc filters more convenient (thx to @vavrusa)
+* support wildcard ad-hoc filters for dashboards using multiple tables (thx to @vavrusa)
+* parse dimensions from GROUP BY to simplify querying (see [piechart](https://github.com/Vertamedia/clickhouse-grafana#piechart-httpsgrafanacompluginsgrafana-piechart-panel) and [worldmap](https://github.com/Vertamedia/clickhouse-grafana#worldmap-panel-httpsgithubcomgrafanaworldmap-panel) examples) (thx to @vavrusa)
+* `$timeCol` to `$dateCol` renamed to be more clear with column types (thx to @simPod)
+
+
 # 1.4.3 (2018-04-09)
 
 ## Fixes
diff --git a/dist/CHANGELOG.md b/dist/CHANGELOG.md
index 90c0f6c0d..674750dc7 100644
--- a/dist/CHANGELOG.md
+++ b/dist/CHANGELOG.md
@@ -1,3 +1,13 @@
+# 1.5.0 (2018-05-31)
+
+## New Features
+
+* new datasource setting - `default database`. If set it will be prefilled in the query builder, and used to make ad-hoc filters more convenient (thx to @vavrusa)
+* support wildcard ad-hoc filters for dashboards using multiple tables (thx to @vavrusa)
+* parse dimensions from GROUP BY to simplify querying (see [piechart](https://github.com/Vertamedia/clickhouse-grafana#piechart-httpsgrafanacompluginsgrafana-piechart-panel) and [worldmap](https://github.com/Vertamedia/clickhouse-grafana#worldmap-panel-httpsgithubcomgrafanaworldmap-panel) examples) (thx to @vavrusa)
+* `$timeCol` to `$dateCol` renamed to be more clear with column types (thx to @simPod)
+
+
 # 1.4.3 (2018-04-09)
 
 ## Fixes
diff --git a/dist/plugin.json b/dist/plugin.json
index 3fa0fde12..80c13ea21 100644
--- a/dist/plugin.json
+++ b/dist/plugin.json
@@ -24,6 +24,6 @@
         "url": "https://github.com/Vertamedia/clickhouse-grafana"
       }
     ],
-    "version": "1.4.3"
+    "version": "1.5.0"
   }
 }
diff --git a/src/plugin.json b/src/plugin.json
index 3fa0fde12..80c13ea21 100644
--- a/src/plugin.json
+++ b/src/plugin.json
@@ -24,6 +24,6 @@
         "url": "https://github.com/Vertamedia/clickhouse-grafana"
       }
     ],
-    "version": "1.4.3"
+    "version": "1.5.0"
   }
 }