summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2017-10-31 16:30:36 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2017-10-31 16:30:36 (GMT)
commit66ef08939ff3e653b1f12d4c2239b2c9fcb31d7e (patch)
treecb6d1400239697e069e0f0fbfe9ae50ad4692837
parentbdf1b6edd290739605cf92a947a17aee741b5387 (diff)
parent11ccbed3c93d3c34d63591ba93a355300ab38c96 (diff)
downloadhdf5-66ef08939ff3e653b1f12d4c2239b2c9fcb31d7e.zip
hdf5-66ef08939ff3e653b1f12d4c2239b2c9fcb31d7e.tar.gz
hdf5-66ef08939ff3e653b1f12d4c2239b2c9fcb31d7e.tar.bz2
Merge pull request #738 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '11ccbed3c93d3c34d63591ba93a355300ab38c96': Update H5Zfilter_avail note New requirement for test
-rw-r--r--config/cmake/cacheinit.cmake2
-rw-r--r--release_docs/RELEASE.txt4
2 files changed, 3 insertions, 3 deletions
diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake
index d37c339..d5c5e52 100644
--- a/config/cmake/cacheinit.cmake
+++ b/config/cmake/cacheinit.cmake
@@ -29,7 +29,7 @@ set (HDF5_ENABLE_SZIP_SUPPORT ON CACHE BOOL "Use SZip Filter" FORCE)
set (HDF5_ENABLE_SZIP_ENCODING ON CACHE BOOL "Use SZip Encoding" FORCE)
-set (MPIEXEC_MAX_NUMPROCS "3" CACHE STRING "Minimum number of processes for HDF parallel tests" FORCE)
+set (MPIEXEC_MAX_NUMPROCS "4" CACHE STRING "Minimum number of processes for HDF parallel tests" FORCE)
set (HDF5_ENABLE_ALL_WARNINGS ON CACHE BOOL "Enable all warnings" FORCE)
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 7aa6322..b66355e 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -166,7 +166,7 @@ Bug Fixes since HDF5-1.10.1 release
Moved check for plugin from public to private function. Updated
H5P__set_filter due to change in H5Z_filter_avail. Updated tests.
- (ADB - 2017/10/10, HDFFV-10297)
+ (ADB - 2017/10/10, HDFFV-10297, HDFFV-10319)
Configuration
-------------
@@ -204,7 +204,7 @@ Bug Fixes since HDF5-1.10.1 release
applies to all objects. Lines with notation and no information
have been removed.
- (ADB - 2017/10/10, HDFFV-10297)
+ (ADB - 2017/10/10, HDFFV-10297, HDFFV-10319)
- h5repack