summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2015-08-26 16:28:30 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2015-08-26 16:28:30 -0300
commitccecd1b3750bd10404511c33be1aaca82631a502 (patch)
tree3bf3c29bab0410cb5143994804cde0f8d4517e11
parent580c2a8990ceadcd49fdffdccaaa2a73b95807d1 (diff)
[pkg] fold in changes0.4.2
-rw-r--r--CHANGELOG9
-rw-r--r--changes/bug_7234_add-http-request-timeout1
-rw-r--r--changes/feature_7259_disable_events1
-rw-r--r--changes/feature_allow-passing-callback-to-http-client1
4 files changed, 9 insertions, 3 deletions
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.
diff --git a/changes/bug_7234_add-http-request-timeout b/changes/bug_7234_add-http-request-timeout
deleted file mode 100644
index d18b28b..0000000
--- a/changes/bug_7234_add-http-request-timeout
+++ /dev/null
@@ -1 +0,0 @@
- o Add http request timeout. Related to #7234.
diff --git a/changes/feature_7259_disable_events b/changes/feature_7259_disable_events
deleted file mode 100644
index d08d3c1..0000000
--- a/changes/feature_7259_disable_events
+++ /dev/null
@@ -1 +0,0 @@
-- Add a flag to disable events framework. Closes: #7259
diff --git a/changes/feature_allow-passing-callback-to-http-client b/changes/feature_allow-passing-callback-to-http-client
deleted file mode 100644
index e7d2968..0000000
--- a/changes/feature_allow-passing-callback-to-http-client
+++ /dev/null
@@ -1 +0,0 @@
-- Allow passing callback to HTTP client.