From f7691755c2692325a084f6ec5b0bde76dcfaca96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com>
Date: Wed, 16 May 2012 20:29:06 +0200
Subject: [PATCH] Release slapos.core-0.25

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

diff --git a/CHANGES.txt b/CHANGES.txt
index 3f4ca0975..6dee38dba 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,12 +1,16 @@
 Changes
 =======
 
-0.25 (Unreleased)
+0.25 (2012-05-16)
 -----------------
 
  * Fix support for no_bridge option in configuration files for some values:
    no_bridge = false was stated as true. [Cedric de Saint Martin]
  * Delay a randomized period of time before calling slapgrid. [Yingjie Xu]
+ * slapformat: Don't require tunctl if no_bridge is set [Leonardo Rochael]
+ * slapformat: remove monkey patching when creating address so that it doesn't
+   return false positive. [Cedric de Saint Martin]
+ * Various: clearer error messages.
 
 0.24 (2012-03-29)
 -----------------
diff --git a/setup.py b/setup.py
index 442b18b82..350542070 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '0.25-dev'
+version = '0.25'
 name = 'slapos.core'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"
-- 
2.30.9