From 85a1d5485ecaabcb35725c8e8b5580ee90030260 Mon Sep 17 00:00:00 2001
From: Regan Kuchan <regankuchan@gmail.com>
Date: Fri, 10 Mar 2017 19:11:13 -0800
Subject: [PATCH] Update Changelog and Readme for beta5

---
 CHANGELOG.md | 16 ++++++++++++----
 README.md    | 11 +++++++++--
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1043217d..3642bed1a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,25 @@
 ## v1.2.0 [unreleased]
 
+### Bug Fixes
+
+### Features
+
+### UI Improvements
+
+## v1.2.0-beta5 [2017-03-10]
+
 ### Bug Fixes
   1. [#936](https://github.com/influxdata/chronograf/pull/936): Fix leaking sockets for InfluxQL queries
-  2. [#967](https://github.com/influxdata/chronograf/pull/967): Fix flash of empty graph on auto-refresh when no results were previously returned from a query.
+  2. [#967](https://github.com/influxdata/chronograf/pull/967): Fix flash of empty graph on auto-refresh when no results were previously returned from a query
   3. [#968](https://github.com/influxdata/chronograf/issue/968): Fix wrong database used in dashboards
 
 ### Features
-  1. [#993](https://github.com/influxdata/chronograf/pull/993): Add Admin page with ability to manage Users, Roles, and Permissions for InfluxDB and Enterprise
-  2. [#993](https://github.com/influxdata/chronograf/pull/993): Add ability to manage Queries for InfluxDB and Enterprise
+  1. [#993](https://github.com/influxdata/chronograf/pull/993): Add Admin page for managing users, roles, and permissions for [OSS InfluxDB](https://github.com/influxdata/influxdb) and InfluxData's [Enterprise](https://docs.influxdata.com/enterprise/v1.2/) product
+  2. [#993](https://github.com/influxdata/chronograf/pull/993): Add Query Management features including the ability to view active queries and stop queries
 
 ### UI Improvements
   1. [#989](https://github.com/influxdata/chronograf/pull/989) Add a canned dashboard for mesos
-  2. [#993](https://github.com/influxdata/chronograf/pull/993): Improve multi-select dropdown
+  2. [#993](https://github.com/influxdata/chronograf/pull/993): Improve the multi-select dropdown
   3. [#993](https://github.com/influxdata/chronograf/pull/993): Provide better error information to users
 
 ## v1.2.0-beta4 [2017-02-24]
diff --git a/README.md b/README.md
index f4050f062..83c257c95 100644
--- a/README.md
+++ b/README.md
@@ -110,7 +110,14 @@ A UI for [Kapacitor](https://github.com/influxdata/kapacitor) alert creation and
 * View all active alerts at a glance on the alerting dashboard
 * Enable and disable existing alert rules with the check of a box
 
-### TLS/HTTPS support
+### User and Query Management
+
+Manage users, roles, permissions for [OSS InfluxDB](https://github.com/influxdata/influxdb) and InfluxData's [Enterprise](https://docs.influxdata.com/enterprise/v1.2/) product.
+View actively running queries and stop expensive queries on the Query Management page.
+
+These features are new in Chronograf version 1.2.0-beta5. We recommend using them in a non-production environment only. Should you come across any bugs or unexpected behavior please open [an issue](https://github.com/influxdata/chronograf/issues/new). We appreciate the feedback as we work to finalize and improve the user and query management features!
+
+### TLS/HTTPS Support
 See [Chronograf with TLS](https://github.com/influxdata/chronograf/blob/master/docs/tls.md) for more information.
 
 ### OAuth Login
@@ -121,7 +128,7 @@ Change the default root path of the Chronograf server with the `--basepath` opti
 
 ## Versions
 
-Chronograf v1.2.0-beta4 is a beta release.
+Chronograf v1.2.0-beta5 is a beta release.
 We will be iterating quickly based on user feedback and recommend using the [nightly builds](https://www.influxdata.com/downloads/) for the time being.
 
 Spotted a bug or have a feature request?