From 92d545771828df407426dbcfd23a6abc4e46c4df Mon Sep 17 00:00:00 2001
From: Alain Takoudjou <talino@tiolive.com>
Date: Tue, 8 Dec 2015 10:24:28 +0100
Subject: [PATCH] Release slapos.core 1.3.15

---
 CHANGES.txt       | 6 +++++-
 slapos/version.py | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 286d7082b..30f1ef4a4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,11 @@
 Changes
 =======
 
-1.3.13 (2015-10-27)
+1.3.15 (2015-12-08)
+-------------------
+ * slapos.collect: Include disk usage report. Do not divide cpu_load by number of cpu cores.
+
+1.3.14 (2015-10-27)
 -------------------
  * slapos.grid: firewall fix bugs
 
diff --git a/slapos/version.py b/slapos/version.py
index ee0dedc6e..ffd7e80ae 100644
--- a/slapos/version.py
+++ b/slapos/version.py
@@ -26,4 +26,4 @@
 #
 ##############################################################################
 
-version = '1.3.14'
+version = '1.3.15'
-- 
2.30.9