From 215e0e61494bb831e828b36dc255904b0beb3fe2 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Wed, 5 May 2010 20:24:34 +0200
Subject: [PATCH] modify CHANGELOG

---
 CHANGELOG | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 31cfb6b..51a49be 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,12 +1,14 @@
 1.2
 -------------------------
 
-- fix issue79: sessionfinish/teardown hooks more systematically 
+- fix issue79: sessionfinish/teardown hooks are now called systematically 
   on the slave side 
 - introduce a new data input/output mechanism to allow the master side 
   to send and receive data from a slave. 
 - fix race condition in underlying pickling/unpickling handling 
-- use and require new register hooks facility of py.test>=1.2.2 
+- use and require new register hooks facility of py.test>=1.3.0 
+- require improved execnet>=1.0.6 because of various race conditions 
+  that can arise in xdist testing modes. 
 - fix some python3 related pickling related race conditions 
 - fix PyPI description