From 31477b50826dc6d3bf92f543ed7177694813aa3f Mon Sep 17 00:00:00 2001
From: Cory Benfield <cory.benfield@metaswitch.com>
Date: Mon, 29 Jun 2015 11:51:42 +0100
Subject: [PATCH] Version 0.26

---
 CHANGES.md          |  3 ++-
 debian/changelog    | 18 ++++++++++++++++++
 docs/source/conf.py |  4 ++--
 rpm/calico.spec     | 17 ++++++++++++++++-
 setup.py            |  2 +-
 5 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 472ba47966..34af08176c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 0.26-dev
+## 0.26
 
 - Update and improve security model documentation.
 - Streamline conntrack rules, move them to top-level chains to avoid
@@ -14,6 +14,7 @@
 - Change log rotation strategy for logrotate to not rotate small log files.
 - Delay starting the Neutron resynchronization thread until after all the
   necessary state has been configured, to avoid race conditions.
+- Prevent systemd restarting Felix when it is killed by administrators.
 
 ## 0.25
 
diff --git a/debian/changelog b/debian/changelog
index 4dfe01d16e..d4e4816fa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+calico (0.26) trusty; urgency=medium
+
+  * Update and improve security model documentation.
+  * Streamline conntrack rules, move them to top-level chains to avoid
+    duplication.
+  * Narrow focus of input iptables chain so that it only applies to
+    Calico-handled traffic.
+  * Provide warning log when attempting to use Neutron networks that are not of
+    type 'local' or 'flat' with Calico.
+  * Handle invalid JSON in IPAM key in etcd.
+  * Move all log rotation into logrotate and out of Felix, to prevent conflicts.
+  * Change log rotation strategy for logrotate to not rotate small log files.
+  * Delay starting the Neutron resynchronization thread until after all the
+    necessary state has been configured, to avoid race conditions.
+  * Prevent systemd restarting Felix when it is killed by administrators.
+
+ -- Cory Benfield <cory@projectcalico.org>  Mon, 29 Jun 2015 11:49:42 +0100
+
 calico (0.25) trusty; urgency=medium
 
   * Remove stale conntrack entries when an endpoint's IP is removed.
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 0852ab88c5..00ed0a0dc8 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -53,9 +53,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.25'
+version = '0.26'
 # The full version, including alpha/beta/rc tags.
-release = '0.25'
+release = '0.26'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/rpm/calico.spec b/rpm/calico.spec
index 37c3d06f3a..bb2ffd69d3 100644
--- a/rpm/calico.spec
+++ b/rpm/calico.spec
@@ -2,7 +2,7 @@
 
 Name:           calico
 Summary:        Project Calico virtual networking for cloud data centers
-Version:        0.25
+Version:        0.26
 Release:        1%{?dist}
 License:        Apache-2
 URL:            http://projectcalico.org
@@ -209,6 +209,21 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jun 29 2015 Cory Benfield <cory@projectcalico.org> 0.26
+  - Update and improve security model documentation.
+  - Streamline conntrack rules, move them to top-level chains to avoid
+    duplication.
+  - Narrow focus of input iptables chain so that it only applies to
+    Calico-handled traffic.
+  - Provide warning log when attempting to use Neutron networks that are not of
+    type 'local' or 'flat' with Calico.
+  - Handle invalid JSON in IPAM key in etcd.
+  - Move all log rotation into logrotate and out of Felix, to prevent conflicts.
+  - Change log rotation strategy for logrotate to not rotate small log files.
+  - Delay starting the Neutron resynchronization thread until after all the
+    necessary state has been configured, to avoid race conditions.
+  - Prevent systemd restarting Felix when it is killed by administrators.
+
 * Mon Jun 22 2015 Cory Benfield <cory@projectcalico.org> 0.25
   - Remove stale conntrack entries when an endpoint's IP is removed.
   - #672: Fix bug where profile chain was left empty instead of being
diff --git a/setup.py b/setup.py
index a1d297e911..6a638f1682 100644
--- a/setup.py
+++ b/setup.py
@@ -71,7 +71,7 @@ def filter_requirements(filters, file):
 
 setuptools.setup(
     name = "calico",
-    version = "0.25",
+    version = "0.26",
     packages = setuptools.find_packages(),
     entry_points = {
         'console_scripts': [