From 52271477df4a80d2a2864ccad2ec6839a8defa6b Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 1 Jun 2018 12:21:53 +0200
Subject: [PATCH] Version 1.15.0

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

diff --git a/IDMETA b/IDMETA
index bf501ba1..58f7e563 100644
--- a/IDMETA
+++ b/IDMETA
@@ -1,4 +1,4 @@
 DEBIAN_DIST="stretch jessie wheezy"
 UBUNTU_DIST="bionic xenial trusty"
 CENTOS_DIST="centos6 centos7"
-VERSION=1.14.0
+VERSION=1.15.0
diff --git a/NEWS b/NEWS
index 5ea59c06..59bf886f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+--- 1.15.0 2018/06/01
+
+metaproxy: option -s sets resource limit for open files (ulimit -n)
+
 --- 1.14.0 2018/05/23
 
 frontend_net: allow limit of connections from same IP MP-657
diff --git a/win/makefile b/win/makefile
index 1b3558d3..dd2e9b4f 100644
--- a/win/makefile
+++ b/win/makefile
@@ -8,7 +8,7 @@
 DEBUG=0   # 0 for release, 1 for debug
 
 # Metaproxy version
-VERSION=1.14.0
+VERSION=1.15.0
 
 # YAZ and YAZ++ directories
 YAZ_DIR=..\..\yaz