From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 19 Oct 2015 10:47:19 +0000 (+0000)
Subject: Version 1.12.5
X-Git-Tag: v1.12.5
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=fa141480afbaef84ff01c1f37cd72b2154175cf1;p=pazpar2-moved-to-github.git

Version 1.12.5
---

diff --git a/IDMETA b/IDMETA
index 6057777..70d2418 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.12.4
+VERSION=1.12.5
diff --git a/NEWS b/NEWS
index 659af0a..0d47f90 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+--- 1.12.5 2015/10/19
+
+Usage limit PAZ-1038
+Guard against running out of sockets/file-descriptors. The limit may
+be set with <socket max="number"/> in main configuration. If omitted,
+the system default is used (getrlimit RLIMIT_NOFILE).
+
 --- 1.12.4 2015/09/15
 
 log msg cleanup PAZ-1037
diff --git a/win/makefile b/win/makefile
index c488018..d256a07 100644
--- a/win/makefile
+++ b/win/makefile
@@ -5,7 +5,7 @@
 DEBUG=0   # 0 for release, 1 for debug
 USE_MANIFEST = 0 # Can be enabled Visual Studio 2005/2008
 PACKAGE_NAME=pazpar2
-PACKAGE_VERSION=1.12.4
+PACKAGE_VERSION=1.12.5
 
 # YAZ
 YAZ_DIR=..\..\yaz