From 64463f6fb66b8685ad399b0ac90af1c99f54457e Mon Sep 17 00:00:00 2001
From: Yves Mettier <ymettier@free.fr>
Date: Mon, 21 Sep 2015 08:43:15 +0200
Subject: [PATCH] New release 1.6.0

---
 ChangeLog    | 13 ++++++-------
 package.json |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 56fdccd..0cd91b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,17 +1,16 @@
-Version 1.6.0rc2
-- Fixed a bug in Ping plugin (stddev)
-- Moved to node-0.12.7
-- ... and removed the Ping plugin due to instabilities
-
-Version 1.6.0rc1
+Version 1.6.0
 
+- Moved to node-0.12.7
 - PR #10 : added Load plugin (Thanks to Paul Tzianos)
-- PR #11 : added Ping plugin (Thanks to Paul Tzianos)
 - PR #12 : added Disk plugin (Thanks to Paul Tzianos)
 - PR #15 : added Df plugin (Thanks to Paul Tzianos)
 - PR #13 (1) : removed duplicate modules from collectdCompat plugin (Thanks to Paul Tzianos)
 - PR #13 (2) : some modules of CollectdCompat plugin are now optional (Thanks to Paul Tzianos)
 - PR #14 : Added crypto support (Thanks to Dimitris Rozakis)
+Ping plugin (added and removed)
+- Fixed a bug in Ping plugin (stddev)
+- ... and removed the Ping plugin due to instabilities
+- PR #11 : added Ping plugin (Thanks to Paul Tzianos)
 
 Version 1.5.1
 
diff --git a/package.json b/package.json
index fa4a4a9..f437ebe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CollectM",
-  "version": "1.6.0rc2",
+  "version": "1.6.0",
   "author": "Cyril Feraudet",
   "license": "GPLv2",
   "dependancies": {