From 8e61b98c5e2943b149c825310b24e714a6127072 Mon Sep 17 00:00:00 2001
From: Martin Lucina <martin@lucina.net>
Date: Mon, 23 Jan 2012 08:53:41 +0100
Subject: Imported Upstream version 2.1.4

---
 ChangeLog | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 114 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index ef98a4b..779b799 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,119 @@
 # Generated by Makefile. Do not edit.
 
+commit 3420eb7304ec05e2d7f36ac6f811abf2d0ba8bff
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Mar 30 14:09:19 2011 +0200
+
+    Updated NEWS for 2.1.4
+
+ NEWS |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e621c48ba04fe5dbe77f416bed185a60273e5be0
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Mon Mar 28 20:52:22 2011 +0200
+
+    Restored HTML man pages output
+
+ doc/Makefile.am |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+commit a18d55633378e6949a4dd619ade3bd434ec3614e
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Sat Mar 26 09:53:06 2011 +0100
+
+    Added missing HWP/inproc change to 2.1.1 notes
+
+ NEWS |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 20e6dc44164bea5b247225dac8dcbf7630314f72
+Merge: 1a8d95d 55d6932
+Author: Mikko Koppanen <mkoppanen@php.net>
+Date:   Wed Mar 23 14:21:02 2011 +0000
+
+    Merge branch 'master' of https://github.com/zeromq/zeromq2-1
+
+commit 1a8d95da9eae484df2c3b6879b3c6f76b48a98cb
+Author: Mikko Koppanen <mkoppanen@php.net>
+Date:   Wed Mar 23 14:20:57 2011 +0000
+
+    Fix make dist
+
+ Makefile.am                 |    7 ++++++-
+ configure.in                |    3 +++
+ foreign/openpgm/Makefile.am |    4 +++-
+ 3 files changed, 12 insertions(+), 2 deletions(-)
+
+commit 55d6932031da03d1321e728a376a64217ecf0d61
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Mar 23 11:45:38 2011 +0100
+
+    Upgraded OpenPGM to 5.1.115
+
+ NEWS                                       |    5 +++++
+ foreign/openpgm/libpgm-5.1.114~dfsg.tar.gz |  Bin 1051807 -> 0 bytes
+ foreign/openpgm/libpgm-5.1.115~dfsg.tar.gz |  Bin 0 -> 1054630 bytes
+ 3 files changed, 5 insertions(+), 0 deletions(-)
+
+commit f392d73332d5642f17a85ffe337c7f45217f4124
+Author: Steven McCoy <steven.mccoy@miru.hk>
+Date:   Wed Mar 23 14:55:00 2011 +0800
+
+    OpenPGM 5.1.115 to fix assertion with messages smaller than an IP header length.
+    
+    Signed-off-by: Steven McCoy <steven.mccoy@miru.hk>
+
+ configure.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 4c988d321a60279bf324140c539b6e586d5c29d2
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Tue Mar 22 22:31:30 2011 +0100
+
+    Prepared for 2.1.4 release
+
+ NEWS          |   11 +++++++++++
+ include/zmq.h |    2 +-
+ 2 files changed, 12 insertions(+), 1 deletions(-)
+
+commit 34b7f54b0fa6e7884a76792633ca66f176d25906
+Merge: b10138f 91bdf04
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Tue Mar 22 22:29:12 2011 +0100
+
+    Merge branch 'openpgm-no-artifact' of https://github.com/mkoppanen/zeromq2-1 into mkoppanen-openpgm-no-artifact
+
+commit 91bdf04ac5d70c265efe44ae9462c403ec8a93e7
+Author: Mikko Koppanen <mkoppanen@php.net>
+Date:   Tue Mar 22 09:21:05 2011 +0000
+
+    Make sure that OpenPGM artifacts are not installed during ZeroMQ installation and remove unnecessary OpenPGM build defines
+
+ .gitignore                  |    1 +
+ Makefile.am                 |    2 +-
+ configure.in                |   53 +++---------------------------------------
+ foreign/openpgm/Makefile.am |    6 +++++
+ 4 files changed, 12 insertions(+), 50 deletions(-)
+
+commit b10138f6ec803b9b616c483a7792fb5ed4e9ccc6
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Mon Mar 21 21:08:23 2011 +0100
+
+    Fixed RHAT packaging for removed devices
+
+ builds/redhat/zeromq.spec |    8 +-------
+ 1 files changed, 1 insertions(+), 7 deletions(-)
+
+commit 3c0180fbda42d04659268e50241ca75c1668d01e
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Mon Mar 21 14:05:48 2011 +0100
+
+    Fixed error in OpenPGM news
+
+ NEWS |    3 ---
+ 1 files changed, 0 insertions(+), 3 deletions(-)
+
 commit 31d8b7f74daa3f094347876db2774112d80611fe
 Author: Pieter Hintjens <ph@imatix.com>
 Date:   Mon Mar 21 10:08:42 2011 +0100
-- 
cgit v1.2.3