Merge pull request #265 from wtsi-npg/devel

Pull from devel to master to create release 4.0.0

ChangeLog

@@ -1,5 +1,10 @@
 	[Upcoming]
 
+	[4.0.0]
+
+	Improve connection management by closing the connection while
+	waiting for the next JSON document and reopening when required.
+
 	[3.3.0]
 
 	Fix ability to list the checksum of an object with a bad replica.

README

@@ -45,6 +45,8 @@ iRODS compatibility:
     2.1.x          4.1.x - 4.2.7
     3.0.x          4.2.7 - 4.2.8
     3.1.x          4.2.7 - 4.2.9
+    3.2.x          4.2.7 - 4.2.11
+    3.3.x          4.2.7 - 4.2.11
 
 Installation:
 

configure.ac

@@ -116,24 +116,7 @@ AC_ARG_WITH([test-resource],
     TEST_RESOURCE="testResc"])
 dnl End test resource
 
-dnl Begin put workaround
-dnl See for https://github.com/irods/irods/issues/5072
-wo_url="https://github.com/irods/irods/issues/5072"
-
-AC_ARG_ENABLE([put-workaround],
-  [AS_HELP_STRING([--enable-put-workaround],
-    [Enable workaround for ${wo_url} (default is no)])],
-  [put_workaround_enabled=${enableval}], [put_workaround_enabled=no])
-
-AS_IF([test "x${put_workaround_enabled}" = "xyes"],
-  [AC_MSG_NOTICE([enabled workaround for ${wo_url}])]
-  [AC_DEFINE([ENABLE_PUT_WORKAROUND],
-     [],
-     "Workaround for ${wo_url}")],
-  [])
-AM_CONDITIONAL(PUT_WORKAROUND_ENABLED,
-               [test "x${put_workaround_enabled}" = "xyes"])
-dnl End put workaround
+AX_PTHREAD(, [AC_MSG_ERROR([unable to find libpthread])])
 
 AC_CHECK_LIB([jansson], [json_unpack], [],
              [AC_MSG_ERROR([unable to find libjansson])])

doc/index.rst

@@ -40,6 +40,8 @@ iRODS:
 * Simplified API over the iRODS general query API to ease construction
   of new custom queries.
 
+* Automatic release of iRODS connections when idle (see the ``--connect-time``
+  command line option).
 
 .. toctree::
    :maxdepth: 2
@@ -226,7 +228,7 @@ Options
 .. program:: baton-chmod
 .. option:: --unsafe
 
-  Permit relative paths, which are unsafe in iRODS 3.x - 4.1.x
+  Permit relative paths, which are unsafe in iRODS 3.x - 4.2.x
 
 .. program:: baton-chmod
 .. option:: --verbose