From c85c5d05c53b66c1be18e6eb1eebb2b8d6de9efe Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Thu, 9 Oct 2014 12:29:57 +0200
Subject: [PATCH] add changelog entry for new hookwrapper mechanism

---
 CHANGELOG | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 83f63601c..cad8958d7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,17 @@
-Unreleased
+2.7.0.dev
+----------
+
+- introduce and document new hookwrapper mechanism useful for plugins
+  which want to wrap the execution of certain hooks for their purposes.
+  This supersedes the undocumented ``__multicall__`` protocol which
+  pytest itself and some external plugins use.  Note that pytest-2.8
+  is scheduled to drop supporting the old ``__multicall__`` 
+  and only support the hookwrapper protocol.
+
+- use hookwrapper mechanism in builtin pytest plugins.
+
+
+2.6.4.dev
 ----------
 
 - Improve assertion failure reporting on iterables, by using ndiff and pprint.