From b57a6b7bf769f8642e062d96b5f47101ab9416ee Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 17 Nov 2015 19:14:48 +0000
Subject: [PATCH] Version 1.11.0

---
 IDMETA       |    2 +-
 NEWS         |    9 +++++++++
 win/makefile |    2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/IDMETA b/IDMETA
index 8b420f4..37b0dd2 100644
--- a/IDMETA
+++ b/IDMETA
@@ -1,4 +1,4 @@
 DEBIAN_DIST="jessie wheezy"
 UBUNTU_DIST="vivid trusty precise"
 CENTOS_DIST="centos5 centos6 centos7"
-VERSION=1.10.0
+VERSION=1.11.0
diff --git a/NEWS b/NEWS
index 7ac7841..68d2908 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+--- 1.11.0 2015/11/17
+
+frontend_net: connect-max anx http-req-max may be specified
+based on originating IP. MP-632
+
+frontend_net: fix leaks that would occur if http-req-max takes effect.
+
+Report file descriptor limit (RLIMIT_NOFILE) upon startup MP-631 
+
 --- 1.10.0 2015/10/01
 
 Fix sort: does not sort during leading present MP-630
diff --git a/win/makefile b/win/makefile
index 29d3e64..10b117d 100644
--- a/win/makefile
+++ b/win/makefile
@@ -8,7 +8,7 @@
 DEBUG=0   # 0 for release, 1 for debug
 
 # Metaproxy version
-VERSION=1.10.0
+VERSION=1.11.0
 
 # YAZ and YAZ++ directories
 YAZ_DIR=..\..\yaz
-- 
1.7.10.4