summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2018-11-08 17:32:11 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2018-11-08 17:32:11 (GMT)
commita9cb14740f0528060c1e6b6bc4753a33d65c265f (patch)
tree601847fe45c3d106257600e3b2b7508290275692
parent3b9e13a1b819584c91bfaa134536345a1460f44f (diff)
parent79858bfde5ccdb27cc256252ebdc51c1a9f403b0 (diff)
downloadhdf5-a9cb14740f0528060c1e6b6bc4753a33d65c265f.zip
hdf5-a9cb14740f0528060c1e6b6bc4753a33d65c265f.tar.gz
hdf5-a9cb14740f0528060c1e6b6bc4753a33d65c265f.tar.bz2
Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit '79858bfde5ccdb27cc256252ebdc51c1a9f403b0': Snapshot version 1.10 release 5 (snap1)
-rw-r--r--README.txt2
-rw-r--r--c++/src/cpp_doc_config2
-rwxr-xr-xconfig/cmake/scripts/HDF5config.cmake2
-rw-r--r--configure.ac2
-rw-r--r--release_docs/RELEASE.txt2
-rw-r--r--src/H5public.h4
6 files changed, 7 insertions, 7 deletions
diff --git a/README.txt b/README.txt
index e9f87f4..3a3864c 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.10.5-snap0 currently under development
+HDF5 version 1.10.5-snap1 currently under development
------------------------------------------------------------------------------
Please refer to the release_docs/INSTALL file for installation instructions.
diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config
index bbab0e9..7e3c91d 100644
--- a/c++/src/cpp_doc_config
+++ b/c++/src/cpp_doc_config
@@ -38,7 +38,7 @@ PROJECT_NAME =
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = "1.10.5-snap0, currently under development"
+PROJECT_NUMBER = "1.10.5-snap1, currently under development"
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index e770905..b175ea1 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -35,7 +35,7 @@ cmake_minimum_required (VERSION 3.10)
##############################################################################
set (CTEST_SOURCE_VERSION "1.10.5")
-set (CTEST_SOURCE_VERSEXT "-snap0")
+set (CTEST_SOURCE_VERSEXT "-snap1")
##############################################################################
# handle input parameters to script.
diff --git a/configure.ac b/configure.ac
index e82a244..e88fc58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_PREREQ([2.69])
## NOTE: Do not forget to change the version number here when we do a
## release!!!
##
-AC_INIT([HDF5], [1.10.5-snap0], [help@hdfgroup.org])
+AC_INIT([HDF5], [1.10.5-snap1], [help@hdfgroup.org])
AC_CONFIG_SRCDIR([src/H5.c])
AC_CONFIG_HEADERS([src/H5config.h])
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index e7c1014..b0ae212 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.10.5-snap0 currently under development
+HDF5 version 1.10.5-snap1 currently under development
================================================================================
diff --git a/src/H5public.h b/src/H5public.h
index b74af19..1ff2954 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -94,9 +94,9 @@ extern "C" {
#define H5_VERS_MAJOR 1 /* For major interface/format changes */
#define H5_VERS_MINOR 10 /* For minor interface/format changes */
#define H5_VERS_RELEASE 5 /* For tweaks, bug-fixes, or development */
-#define H5_VERS_SUBRELEASE "snap0" /* For pre-releases like snap0 */
+#define H5_VERS_SUBRELEASE "snap1" /* For pre-releases like snap0 */
/* Empty string for real releases. */
-#define H5_VERS_INFO "HDF5 library version: 1.10.5-snap0" /* Full version string */
+#define H5_VERS_INFO "HDF5 library version: 1.10.5-snap1" /* Full version string */
#define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \
H5_VERS_RELEASE)