From ba2c862c17843765403f6688290f1627ef776c93 Mon Sep 17 00:00:00 2001
From: ervin <ervin.konomi@pd.infn.it>
Date: Wed, 20 Sep 2017 12:31:38 +0200
Subject: [PATCH] Realease v2.6.0

Synergy scheduler manager updates

Change-Id: Ib0180e7e0d776f4875e21b673bd25727a8dd2af5
---
 ChangeLog                                           | 11 +++++++++++
 packaging/debian/changelog                          | 11 +++++++++++
 packaging/rpm/python-synergy-scheduler-manager.spec | 10 +++++++++-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 883e442..392531a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,17 @@
 CHANGES
 =======
 
+* Restored setQuotaTypeServer()
+* Restore() incorrectly increases the queue size
+* Synergy should scale up the oldest user requests from the queue
+* Mechanism that performs user actions before Synergy deletes the VMs
+* Configuration parameters updated
+* Termination of expired servers
+
+2.5.1
+-----
+
+* Release 2.5.1
 * fix small typo preventing scheduler initialization
 
 2.5.0
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index c9eb878..4013fd0 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,3 +1,14 @@
+python-synergy-scheduler-manager (2.6.0) unstable; urgency=low
+
+  * Restored setQuotaTypeServer()
+  * Restore() incorrectly increases the queue size
+  * Synergy should scale up the oldest user requests from the queue
+  * Mechanism that performs user actions before Synergy deletes the VMs
+  * Configuration parameters updated
+  * Termination of expired servers
+
+ -- Ervin Konomi <ervin.konomi@pd.infn.it>  Wed, 20 Sep 2017 12:23:33 +0200
+
 python-synergy-scheduler-manager (2.5.1) unstable; urgency=low
 
   * Update some python requirements to python2-* names
diff --git a/packaging/rpm/python-synergy-scheduler-manager.spec b/packaging/rpm/python-synergy-scheduler-manager.spec
index e7d3520..dfccdc8 100644
--- a/packaging/rpm/python-synergy-scheduler-manager.spec
+++ b/packaging/rpm/python-synergy-scheduler-manager.spec
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
 Name:          python-synergy-scheduler-manager
-Version:       2.5.1
+Version:       2.6.0
 Release:       1%{?dist}
 Summary:       Advanced scheduling capability for OpenStack.
 Source:        %name-%version.tar.bz2
@@ -56,6 +56,14 @@ install -D -m0644 config/policy.json                  %{buildroot}%{_sysconfdir}
 
 
 %changelog
+* Wed Sep 20 2017 Ervin Konomi <ervin.konomi@pd.infn.it> - 2.6.0-1
+- Restored setQuotaTypeServer()
+- Restore() incorrectly increases the queue size
+- Synergy should scale up the oldest user requests from the queue
+- Mechanism that performs user actions before Synergy deletes the VMs
+- Configuration parameters updated
+- Termination of expired servers
+
 * Mon Aug 21 2017 Vincent Llorens <vincent.llorens@cc.in2p3.fr> - 2.5.1-1
 - Update some python requirements to python2-* names
 - fix small typo preventing scheduler initialization