From 398e95333c7d77409bf06386ee4b1910b5eb0228 Mon Sep 17 00:00:00 2001
From: Rafael Monnerat <rafael@nexedi.com>
Date: Mon, 26 Jun 2017 15:50:48 +0200
Subject: [PATCH] Release slapos.core 1.4.0

  This version include initial plugin system and cgroups integration.

  We also included a significant change for provide the partitions network informations, which now
  don't require to come from slapos master anymore, so it is possible to make local extensions.
---
 CHANGES.txt       | 10 ++++++++++
 slapos/version.py |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9a481765f..b9933dd81 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,16 @@
 Changes
 =======
 
+1.4.0 (2017-06-26)
+------------------
+
+  * slapos.grid: Use local configuration to extend master configuration
+  * slapos.format: Export partition configuration for the partition
+  * slapos: improve logs and general cleanup
+  * slapos.manager: Added cpuset plugin (for cgroups)
+  * slapos.format: Add TUN interface support
+  * slapos: Implement plugin system
+
 1.3.18 (2016-11-03)
 -------------------
 
diff --git a/slapos/version.py b/slapos/version.py
index fc2da784d..fd2af8cd2 100644
--- a/slapos/version.py
+++ b/slapos/version.py
@@ -26,4 +26,4 @@
 #
 ##############################################################################
 
-version = '1.3.18'
+version = '1.4.0'
-- 
2.25.1