From 1167186f657e57be46477b95d65a74728e78ac63 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Thu, 25 Nov 2010 20:11:59 +0100
Subject: [PATCH] upping version to 1.5

---
 CHANGELOG         | 4 ++--
 setup.py          | 4 ++--
 xdist/__init__.py | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 423b700..565cd29 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,7 @@
-1.5a1
+1.5
 -------------------------
 
-- adapt to pytest-2.0 changes, rsyncdirs and rsyncignore can now
+- adapt to and require pytest-2.0 changes, rsyncdirs and rsyncignore can now
   only be specified in [pytest] sections of ini files, see "py.test -h"
   for details.
 - major internal refactoring to match the pytest-2.0 event refactoring
diff --git a/setup.py b/setup.py
index 4ea8e25..c25c1e7 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name="pytest-xdist",
-    version='1.5a11',
+    version='1.5',
     description='py.test xdist plugin for distributed testing and loop-on-failing modes',
     long_description=open('README.txt').read(),
     license='GPLv2 or later',
@@ -27,4 +27,4 @@ setup(
     'Programming Language :: Python',
     'Programming Language :: Python :: 3',
     ],
-)
+)
\ No newline at end of file
diff --git a/xdist/__init__.py b/xdist/__init__.py
index 74df725..53b03de 100644
--- a/xdist/__init__.py
+++ b/xdist/__init__.py
@@ -1,2 +1,2 @@
 #
-__version__ = '1.5a11'
+__version__ = '1.5'