From 0d4e881389c41d1c1155c88144b85273e9148320 Mon Sep 17 00:00:00 2001
From: Ben Kochie <superq@gmail.com>
Date: Sun, 15 Jan 2017 18:31:20 +0100
Subject: [PATCH] Release v0.14.0-rc.1.

* Update CHANGELOG
* Update VERSION
---
 CHANGELOG.md | 33 +++++++++++++++++++++++++++++++++
 VERSION      |  2 +-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0102e2f5..af1b0e5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,36 @@
+## v0.14.0 / unreleased
+
+NOTE: We are deprecating several collectors in this release.
+    * `gmond` - Out of scope.
+    * `megacli` - Requires forking, moved to textfile collection.
+    * `ntp` - Out of scope.
+
+* [FEATURE] Added loadavg collector for Solaris #311
+* [FEATURE] Add StorCli text collector example script #320
+* [FEATURE] Add collector for Linux EDAC #324
+* [FEATURE] Add text file utility for SMART metrics #354
+* [FEATURE] Add a collector for NFS client statistics. #360
+* [FEATURE] Add mountstats collector for detailed NFS statistics #367
+* [FEATURE] A collector for DRBD #365
+* [FEATURE] Add cpu collector for darwin #391
+* [FEATURE] Add netdev collector for darwin #393
+* [FEATURE] Collect CPU temperatures on FreeBSD #397
+* [FEATURE] Add ZFS collector + review feedback from PRs 213 and 369 #410
+* [FEATURE] Add initial wifi collector #413
+* [FEATURE] Add NFS event metrics to mountstats collector #415
+* [IMPROVEMENT] hwmon: Provide annotation metric to link chip sysfs paths to human-readable chip types #359
+* [IMPROVEMENT] Add node_filesystem_device_errors_total metric #374
+* [IMPROVEMENT] Add runit service dir flag #375
+* [IMPROVEMENT] Improve Docker documentation #376
+* [IMPROVEMENT] Ignore autofs filesystems on linux #384
+* [IMPROVEMENT] Replace some FreeBSD collectors with pure Go versions #385
+* [IMPROVEMENT] Use filename as label, move 'label' to own metric #411 (hwmon)
+* [BUGFIX] mips64 build fix #361
+* [BUGFIX] Update vendoring #372 (to fix #242)
+* [BUGFIX] Convert remaining collectors to use ConstMetrics #389
+* [BUGFIX] Check for errors in netdev scanner #398
+* [BUGFIX] Don't leak or race in FreeBSD devstat collector #396
+
 ## v0.13.0 / 2016-11-26
 
 NOTE: We have disabled builds of linux/ppc64 and linux/ppc64le due to build bugs.
diff --git a/VERSION b/VERSION
index 54d1a4f2..d42ca4b6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.13.0
+0.14.0-rc.1