From ccecd1b3750bd10404511c33be1aaca82631a502 Mon Sep 17 00:00:00 2001
From: Ivan Alejandro <ivanalejandro0@gmail.com>
Date: Wed, 26 Aug 2015 16:28:30 -0300
Subject: [pkg] fold in changes

---
 CHANGELOG | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'CHANGELOG')

diff --git a/CHANGELOG b/CHANGELOG
index 1c6a871..c34dc2f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,12 @@
+0.4.2 Aug 26, 2015:
+  o Add http request timeout. Related to #7234.
+  o Add a flag to disable events framework. Closes: #7259
+  o Allow passing callback to HTTP client.
+  o Bugfix: do not add a port string to non-tcp addresses.
+  o Add close method for http agent.
+  o Fix code style and tests.
+  o Bugfix: HTTP timeout was not being cleared on abort.
+
 0.4.1 Jul 10, 2015:
   o Fix regexp to allow ipc protocol in zmq sockets. Closes: #7089.
   o Remove extraneous data from events logs. Closes #7130.
-- 
cgit v1.2.3