Merge branch 'hdf5_1_8' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_1_8_bmr into hdf5_1_8

10 files changed, 112 insertions, 437 deletions

diff --git a/README.txt b/README.txt
index 7599422..5ea4f4a 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.21-snap13 currently under development
+HDF5 version 1.8.22 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 9dd545d..d64bd4b 100644
--- a/c++/src/cpp_doc_config
+++ b/c++/src/cpp_doc_config
@@ -49,7 +49,7 @@ PROJECT_NAME           = "HDF5 C++ API"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "1.8.21-snap13, currently under development"
+PROJECT_NUMBER         = "1.8.22"
 
 # 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 d06ed0b..1ff10eb 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -34,8 +34,8 @@ cmake_minimum_required (VERSION 3.10)
 #     CTEST_SOURCE_NAME  -  source folder

 ##############################################################################

 

-set (CTEST_SOURCE_VERSION "1.8.21")

-set (CTEST_SOURCE_VERSEXT "-snap13")

+set (CTEST_SOURCE_VERSION "1.8.22")

+set (CTEST_SOURCE_VERSEXT "")

 

 ##############################################################################

 # handle input parameters to script.

diff --git a/configure b/configure
index 28832d8..e6a23ad 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Id.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for HDF5 1.8.21-snap13.
+# Generated by GNU Autoconf 2.69 for HDF5 1.8.22.
 #
 # Report bugs to <help@hdfgroup.org>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='HDF5'
 PACKAGE_TARNAME='hdf5'
-PACKAGE_VERSION='1.8.21-snap13'
-PACKAGE_STRING='HDF5 1.8.21-snap13'
+PACKAGE_VERSION='1.8.22'
+PACKAGE_STRING='HDF5 1.8.22'
 PACKAGE_BUGREPORT='help@hdfgroup.org'
 PACKAGE_URL=''
 
@@ -1480,7 +1480,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures HDF5 1.8.21-snap13 to adapt to many kinds of systems.
+\`configure' configures HDF5 1.8.22 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1550,7 +1550,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of HDF5 1.8.21-snap13:";;
+     short | recursive ) echo "Configuration of HDF5 1.8.22:";;
    esac
   cat <<\_ACEOF
 
@@ -1745,7 +1745,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-HDF5 configure 1.8.21-snap13
+HDF5 configure 1.8.22
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2682,7 +2682,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by HDF5 $as_me 1.8.21-snap13, which was
+It was created by HDF5 $as_me 1.8.22, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3553,7 +3553,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='hdf5'
- VERSION='1.8.21-snap13'
+ VERSION='1.8.22'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -29313,7 +29313,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-HDF5 config.lt 1.8.21-snap13
+HDF5 config.lt 1.8.22
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -31373,7 +31373,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by HDF5 $as_me 1.8.21-snap13, which was
+This file was extended by HDF5 $as_me 1.8.22, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -31439,7 +31439,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-HDF5 config.status 1.8.21-snap13
+HDF5 config.status 1.8.22
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 59494d4..42ce5db 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.8.21-snap13], [help@hdfgroup.org])
+AC_INIT([HDF5], [1.8.22], [help@hdfgroup.org])
 AC_CONFIG_SRCDIR([src/H5.c])
 AC_CONFIG_HEADERS([src/H5config.h])
 
diff --git a/hl/src/H5LTparse.c b/hl/src/H5LTparse.c
index 2a0f267..16a0bcf 100644
--- a/hl/src/H5LTparse.c
+++ b/hl/src/H5LTparse.c
@@ -1641,229 +1641,229 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 99 "H5LTparse.y"
     { memset(arr_stack, 0, STACK_SIZE*sizeof(struct arr_info)); /*initialize here?*/ }
     break;
 
   case 3:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 100 "H5LTparse.y"
     { return (yyval.hid);}
     break;
 
   case 13:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 114 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_I8BE); }
     break;
 
   case 14:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 115 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_I8LE); }
     break;
 
   case 15:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 116 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_I16BE); }
     break;
 
   case 16:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 117 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_I16LE); }
     break;
 
   case 17:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 118 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_I32BE); }
     break;
 
   case 18:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 119 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_I32LE); }
     break;
 
   case 19:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 120 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_I64BE); }
     break;
 
   case 20:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 121 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_I64LE); }
     break;
 
   case 21:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 122 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_U8BE); }
     break;
 
   case 22:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 123 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_U8LE); }
     break;
 
   case 23:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 124 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_U16BE); }
     break;
 
   case 24:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 125 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_U16LE); }
     break;
 
   case 25:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 126 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_U32BE); }
     break;
 
   case 26:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 127 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_U32LE); }
     break;
 
   case 27:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 128 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_U64BE); }
     break;
 
   case 28:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 129 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_U64LE); }
     break;
 
   case 29:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 130 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_CHAR); }
     break;
 
   case 30:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 131 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_SCHAR); }
     break;
 
   case 31:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 132 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_UCHAR); }
     break;
 
   case 32:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 133 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_SHORT); }
     break;
 
   case 33:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 134 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_USHORT); }
     break;
 
   case 34:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 135 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_INT); }
     break;
 
   case 35:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 136 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_UINT); }
     break;
 
   case 36:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 137 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_LONG); }
     break;
 
   case 37:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 138 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_ULONG); }
     break;
 
   case 38:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 139 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_LLONG); }
     break;
 
   case 39:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 140 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_ULLONG); }
     break;
 
   case 40:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 143 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_IEEE_F32BE); }
     break;
 
   case 41:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 144 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_IEEE_F32LE); }
     break;
 
   case 42:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 145 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_IEEE_F64BE); }
     break;
 
   case 43:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 146 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_IEEE_F64LE); }
     break;
 
   case 44:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 147 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_FLOAT); }
     break;
 
   case 45:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 148 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_DOUBLE); }
     break;
 
   case 46:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 149 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_LDOUBLE); }
     break;
 
   case 47:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 153 "H5LTparse.y"
     { csindex++; cmpd_stack[csindex].id = H5Tcreate(H5T_COMPOUND, 1); /*temporarily set size to 1*/ }
     break;
 
   case 48:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 155 "H5LTparse.y"
     { (yyval.hid) = cmpd_stack[csindex].id; 
                               cmpd_stack[csindex].id = 0;
@@ -1873,13 +1873,13 @@ yyreduce:
     break;
 
   case 51:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 164 "H5LTparse.y"
     { cmpd_stack[csindex].is_field = 1; /*notify lexer a compound member is parsed*/ }
     break;
 
   case 52:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 166 "H5LTparse.y"
     {   
                             size_t origin_size, new_size;
@@ -1915,7 +1915,7 @@ yyreduce:
     break;
 
   case 53:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 199 "H5LTparse.y"
     {
                             (yyval.sval) = yylval.sval;
@@ -1923,25 +1923,25 @@ yyreduce:
     break;
 
   case 54:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 204 "H5LTparse.y"
     { (yyval.ival) = 0; }
     break;
 
   case 55:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 206 "H5LTparse.y"
     { (yyval.ival) = yylval.ival; }
     break;
 
   case 57:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 210 "H5LTparse.y"
     { asindex++; /*pushd onto the stack*/ }
     break;
 
   case 58:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 212 "H5LTparse.y"
     { 
                           (yyval.hid) = H5Tarray_create2((yyvsp[(5) - (6)].hid), arr_stack[asindex].ndims, arr_stack[asindex].dims);
@@ -1952,13 +1952,13 @@ yyreduce:
     break;
 
   case 61:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 222 "H5LTparse.y"
     { arr_stack[asindex].is_dim = 1; /*notice lexer of dimension size*/ }
     break;
 
   case 62:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 223 "H5LTparse.y"
     { unsigned ndims = arr_stack[asindex].ndims;
                                   arr_stack[asindex].dims[ndims] = (hsize_t)yylval.ival; 
@@ -1968,19 +1968,19 @@ yyreduce:
     break;
 
   case 65:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 234 "H5LTparse.y"
     { (yyval.hid) = H5Tvlen_create((yyvsp[(3) - (4)].hid)); H5Tclose((yyvsp[(3) - (4)].hid)); }
     break;
 
   case 66:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 239 "H5LTparse.y"
     { is_opq_size = 1; }
     break;
 
   case 67:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 240 "H5LTparse.y"
     {   
                                 size_t size = (size_t)yylval.ival;
@@ -1990,13 +1990,13 @@ yyreduce:
     break;
 
   case 68:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 245 "H5LTparse.y"
     { is_opq_tag = 1; }
     break;
 
   case 69:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 246 "H5LTparse.y"
     {  
                                 H5Tset_tag((yyvsp[(7) - (13)].hid), yylval.sval);
@@ -2005,19 +2005,19 @@ yyreduce:
     break;
 
   case 70:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 250 "H5LTparse.y"
     { (yyval.hid) = (yyvsp[(7) - (15)].hid); }
     break;
 
   case 73:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 258 "H5LTparse.y"
     { is_str_size = 1; }
     break;
 
   case 74:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 259 "H5LTparse.y"
     {  
                                 if((yyvsp[(5) - (6)].ival) == H5T_VARIABLE_TOKEN)
@@ -2029,7 +2029,7 @@ yyreduce:
     break;
 
   case 75:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 267 "H5LTparse.y"
     {
                                 if((yyvsp[(9) - (10)].ival) == H5T_STR_NULLTERM_TOKEN)
@@ -2042,7 +2042,7 @@ yyreduce:
     break;
 
   case 76:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 276 "H5LTparse.y"
     {  
                                 if((yyvsp[(13) - (14)].ival) == H5T_CSET_ASCII_TOKEN)
@@ -2053,7 +2053,7 @@ yyreduce:
     break;
 
   case 77:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 283 "H5LTparse.y"
     {
                                 if((yyvsp[(17) - (18)].hid) == H5T_C_S1_TOKEN)
@@ -2064,7 +2064,7 @@ yyreduce:
     break;
 
   case 78:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 290 "H5LTparse.y"
     {   
                                 hid_t str_id = (yyvsp[(19) - (20)].hid);
@@ -2085,67 +2085,67 @@ yyreduce:
     break;
 
   case 79:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 307 "H5LTparse.y"
     {(yyval.ival) = H5T_VARIABLE_TOKEN;}
     break;
 
   case 81:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 310 "H5LTparse.y"
     {(yyval.ival) = H5T_STR_NULLTERM_TOKEN;}
     break;
 
   case 82:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 311 "H5LTparse.y"
     {(yyval.ival) = H5T_STR_NULLPAD_TOKEN;}
     break;
 
   case 83:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 312 "H5LTparse.y"
     {(yyval.ival) = H5T_STR_SPACEPAD_TOKEN;}
     break;
 
   case 84:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 314 "H5LTparse.y"
     {(yyval.ival) = H5T_CSET_ASCII_TOKEN;}
     break;
 
   case 85:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 315 "H5LTparse.y"
     {(yyval.ival) = H5T_CSET_UTF8_TOKEN;}
     break;
 
   case 86:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 317 "H5LTparse.y"
     {(yyval.hid) = H5T_C_S1_TOKEN;}
     break;
 
   case 87:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 318 "H5LTparse.y"
     {(yyval.hid) = H5T_FORTRAN_S1_TOKEN;}
     break;
 
   case 88:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 322 "H5LTparse.y"
     { is_enum = 1; enum_id = H5Tenum_create((yyvsp[(3) - (4)].hid)); H5Tclose((yyvsp[(3) - (4)].hid)); }
     break;
 
   case 89:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 324 "H5LTparse.y"
     { is_enum = 0; /*reset*/ (yyval.hid) = enum_id; }
     break;
 
   case 92:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 329 "H5LTparse.y"
     {
                                                 is_enum_memb = 1; /*indicate member of enum*/
@@ -2158,7 +2158,7 @@ yyreduce:
     break;
 
   case 93:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 338 "H5LTparse.y"
     {
                                 char char_val=(char)yylval.ival;
@@ -2205,7 +2205,7 @@ yyreduce:
     break;
 
 
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 2191 "H5LTparse.c"
       default: break;
     }
diff --git a/hl/src/H5LTparse.h b/hl/src/H5LTparse.h
index 2af0172..7481a45 100644
--- a/hl/src/H5LTparse.h
+++ b/hl/src/H5LTparse.h
@@ -109,7 +109,7 @@ extern int H5LTyydebug;
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
-/* Line 2065 of yacc.c  */
+/* Line 2058 of yacc.c  */
 #line 66 "H5LTparse.y"
 
     int     ival;         /*for integer token*/
@@ -117,7 +117,7 @@ typedef union YYSTYPE
     hid_t   hid;          /*for hid_t token*/
 
 
-/* Line 2065 of yacc.c  */
+/* Line 2058 of yacc.c  */
 #line 122 "H5LTparse.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 422c9d2..9e6c986 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,14 +1,12 @@
-HDF5 version 1.8.21-snap13 currently under development
+HDF5 version 1.8.22 currently under development
 ================================================================================
 
 INTRODUCTION
 ============
 
-This document describes the differences between HDF5-1.8.20 and
-HDF5-1.8.21, and contains information on the platforms tested and
-known problems in HDF5-1.8.21.
-For more details, see the files HISTORY-1_0-1_8_0_rc3.txt
-and HISTORY-1_8.txt in the release_docs/ directory of the HDF5 source.
+This document describes the differences between HDF5-1.8.21 and HDF5 1.10.22, and
+contains information on the platforms tested and known problems in HDF5-1.10.21.
+For more details check the HISTORY*.txt files in the HDF5 source.
 
 Links to the HDF5 1.8.21 source code, documentation, and additional materials
 can be found on the HDF5 web page at:
@@ -19,7 +17,7 @@ The HDF5 1.8.21 release can be obtained from:
 
      https://support.hdfgroup.org/HDF5/release/obtain518.html
 
-User documentation for 1.8.21 can be accessed directly at this location:
+User documentation for the snapshot can be accessed directly at this location:
 
      https://support.hdfgroup.org/HDF5/doc1.8/
 
@@ -30,8 +28,8 @@ in 1.8.0?" document:
      https://support.hdfgroup.org/HDF5/doc/ADGuide/WhatsNew180.html
 
 All new and modified APIs are listed in detail in the "HDF5 Software Changes
-from Release to Release" document, in the section "Release 1.8.21 (current
-release) versus Release 1.8.20
+from Release to Release" document, in the section "Release 1.8.22 (current
+release) versus Release 1.8.21
 
      https://support.hdfgroup.org/HDF5/doc1.8/ADGuide/Changes.html
 
@@ -57,36 +55,6 @@ New Features
 
     Configuration
     -------------
-    - CMake
-
-      Change minimum version to 3.10.
-
-      This change removes the need to support a copy of the FindMPI.cmake module,
-      which has been removed, along with its subfolder in the config/cmake_ext_mod
-      location.
-
-      (ADB - 2018/03/09)
-
-    - CMake
-
-      Add pkg-config file generation
-
-      Added pkg-config file generation for the C, C++, HL, and HL C++ libraries.
-      In addition, builds on linux will create h5cXXX scripts that use the pkg-config
-      files. This is a limited implementation of a script like autotools h5cc.
-
-      (ADB - 2018/03/08, HDFFV-4359)
-
-    - CMake
-
-      Refactor use of CMAKE_BUILD_TYPE for new variable, which understands
-      the type of generator in use.
-
-      Added new configuration macros to use new HDF_BUILD_TYPE variable. This
-      variable is set correctly for the type of generator being used for the build.
-
-      (ADB - 2018/01/08, HDFFV-10385, HDFFV-10296)
-
     - None
 
 
@@ -117,72 +85,7 @@ New Features
 
     C++ API
     -------
-    - The following C++ API wrappers have been added to class H5Location
-      + H5Lcreate_soft:
-        // Creates a soft link from link_name to target_name.
-        void link(const char *target_name, const char *link_name,...)
-        void link(const H5std_string& target_name,...)
-
-      + H5Lcreate_hard:
-        // Creates a hard link from new_name to curr_name.
-        void link(const char *curr_name, const Group& new_loc,...)
-        void link(const H5std_string& curr_name, const Group& new_loc,...)
-
-        // Creates a hard link from new_name to curr_name in the same location.
-        void link(const char *curr_name, const hid_t same_loc,...)
-        void link(const H5std_string& curr_name, const hid_t same_loc,...)
-
-        Note: previous version CommonFG::link will be deprecated.
-
-      + H5Lcopy:
-        // Copy an object from a group of file to another.
-        void copyLink(const char *src_name, const Group& dst,...)
-        void copyLink(const H5std_string& src_name, const Group& dst,...)
-
-        // Copy an object from a group of file to the same location.
-        void copyLink(const char *src_name, const char *dst_name,...)
-        void copyLink(const H5std_string& src_name,...)
-
-      + H5Lmove:
-        // Rename an object in a group or file to a new location.
-        void moveLink(const char* src_name, const Group& dst,...)
-        void moveLink(const H5std_string& src_name, const Group& dst,...)
-
-        // Rename an object in a group or file to the same location.
-        void moveLink(const char* src_name, const char* dst_name,...)
-        void moveLink(const H5std_string& src_name,...)
-
-        Note: previous version CommonFG::move will be deprecated.
-
-      + H5Ldelete:
-        // Removes the specified link from this location.
-        void unlink(const char *link_name,
-            const LinkAccPropList& lapl = LinkAccPropList::DEFAULT)
-        void unlink(const H5std_string& link_name,
-            const LinkAccPropList& lapl = LinkAccPropList::DEFAULT)
-
-        Note: An additional parameter is added to CommonFG::unlink and it
-              is moved to H5Location.
-
-      (BMR - 2018/05/11 - HDFFV-10445)
-
-    - New property list subclasses
-
-      Property list subclasses StrCreatPropList, LinkCreatPropList, and
-      AttrCreatPropList are added for the C property list classes
-      H5P_STRING_CREATE, H5P_LINK_CREATE, and H5P_ATTRIBUTE_CREATE.
-
-      (BMR - 2018/05/11 - HDFFV-10445)
-
-    - Another argument, LinkCreatPropList& lcpl, is added to the following
-      functions for the use of link creation property list.
-        Group createGroup(const char* name, size_t size_hint = 0,
-                    const LinkCreatPropList& lcpl = LinkCreatPropList::DEFAULT)
-        Group createGroup(const H5std_string& name, size_t size_hint = 0,
-                    const LinkCreatPropList& lcpl = LinkCreatPropList::DEFAULT)
-
-      (BMR - 2018/05/11 - HDFFV-10445)
-
+    - None
 
     High-Level APIs
     ---------------
@@ -197,143 +100,14 @@ Support for New Platforms, Languages, and Compilers
 Bug Fixes since HDF5-1.8.20
 ===========================
 
-    - If an HDF5 file contains a filter pipeline message with a 'number of
-      filters' field that exceeds the maximum number of allowed filters,
-      the error handling code will attempt to dereference a NULL pointer.
-
-      This issue was reported to The HDF Group as issue #CVE-2017-17505.
-
-      NOTE: The HDF5 C library cannot produce such a file. This condition
-            should only occur in a corrupt (or deliberately altered) file
-            or a file created by third-party software.
-
-      This problem arose because the error handling code assumed that
-      the 'number of filters' field implied that a dynamic array of that
-      size had already been created and that the cleanup code should
-      iterate over that array and clean up each element's resources. If
-      an error occurred before the array has been allocated, this will
-      not be true.
-
-      This has been changed so that the number of filters is set to
-      zero on errors. Additionally, the filter array traversal in the
-      error handling code now requires that the filter array not be NULL.
-
-      (DER - 2018/02/06, HDFFV-10354)
-
-    - If an HDF5 file contains a filter pipeline message which contains
-      a 'number of filters' field that exceeds the actual number of
-      filters in the message, the HDF5 C library will read off the end of
-      the read buffer.
-
-      This issue was reported to The HDF Group as issue #CVE-2017-17506.
-
-      NOTE: The HDF5 C library cannot produce such a file. This condition
-            should only occur in a corrupt (or deliberately altered) file
-            or a file created by third-party software.
-
-      The problem was fixed by passing the buffer size with the buffer
-      and ensuring that the pointer cannot be incremented off the end
-      of the buffer. A mismatch between the number of filters declared
-      and the actual number of filters will now invoke normal HDF5
-      error handling.
-
-      (DER - 2018/02/26, HDFFV-10355)
-
-    - If an HDF5 file contains a malformed compound datatype with a
-      suitably large offset, the type conversion code can run off
-      the end of the type conversion buffer, causing a segmentation
-      fault.
-
-      This issue was reported to The HDF Group as issue #CVE-2017-17507.
-
-      NOTE: The HDF5 C library cannot produce such a file. This condition
-            should only occur in a corrupt (or deliberately altered) file
-            or a file created by third-party software.
-
-      THE HDF GROUP WILL NOT FIX THIS BUG AT THIS TIME
-
-      Fixing this problem would involve updating the publicly visible
-      H5T_conv_t function pointer typedef and versioning the API calls
-      which use it. We normally only modify the public API during
-      major releases, so this bug will not be fixed at this time.
-
-      (DER - 2018/02/26, HDFFV-10356)
-
-    - If an HDF5 file contains a malformed compound type which contains
-      a member of size zero, a division by zero error will occur while
-      processing the type.
-
-      This issue was reported to The HDF Group as issue #CVE-2017-17508.
-
-      NOTE: The HDF5 C library cannot produce such a file. This condition
-            should only occur in a corrupt (or deliberately altered) file
-            or a file created by third-party software.
-
-      Checking for zero before dividing fixes the problem. Instead of the
-      division by zero, the normal HDF5 error handling is invoked.
-
-      (DER - 2018/02/26, HDFFV-10357)
-
-    - If an HDF5 file contains a malformed symbol table node that declares
-      it contains more symbols than it actually contains, the library
-      can run off the end of the metadata cache buffer while processing
-      the symbol table node.
-
-      This issue was reported to The HDF Group as issue #CVE-2017-17509.
-
-      NOTE: The HDF5 C library cannot produce such a file. This condition
-            should only occur in a corrupt (or deliberately altered) file
-            or a file created by third-party software.
-
-      Performing bounds checks on the buffer while processing fixes the
-      problem. Instead of the segmentation fault, the normal HDF5 error
-      handling is invoked.
-
-      (DER - 2018/03/12, HDFFV-10358)
-
     Configuration
     -------------
-    - CMake
-
-      Update CMake commands configuration.
-
-      A number of improvements were made to the CMake commands. Most
-      changes simplify usage or eliminate unused constructs. Also,
-      some changes support better cross-platform support.
-
-      (ADB - 2018/02/01, HDFFV-10398)
-
-    - CMake
-
-      Correct usage of CMAKE_BUILD_TYPE variable.
-
-      The use of the CMAKE_BUILD_TYPE is incorrect for multi-config
-      generators (Visual Studio and XCode) and is optional for single
-      config generators. Created a new macro to check
-        GLOBAL PROPERTY -> GENERATOR_IS_MULTI_CONFIG
-      Created two new HDF variable, HDF_BUILD_TYPE and HDF_CFG_BUILD_TYPE.
-      Defaults for these variables is "Release".
-
-      (ADB - 2018/01/10, HDFFV-10385)
-
-    - CMake
-
-      Add replacement of fortran flags if using static CRT.
-
-      Added TARGET_STATIC_CRT_FLAGS call to HDFUseFortran.cmake file in
-      config/cmake_ext_mod folder.
-
-      (ADB - 2018/01/08, HDFFV-10334)
+    - None
 
 
     Library
     -------
-    - Utility function can not handle lowercase Windows drive letters
-
-      Added call to toupper function for drive letter.
-
-      (ADB - 2017/12/18, HDFFV-10307)
-
+    - None
 
 
     Parallel Library
@@ -348,81 +122,7 @@ Bug Fixes since HDF5-1.8.20
 
     Tools
     -----
-    - h5repack
-
-      h5repack changes the chunk parameters when a change of layout is not
-      specified and a filter is applied.
-
-      HDFFV-10297, HDFFV-10319 reworked code for h5repack and h5diff code
-      in the tools library. The check for an existing layout was incorrectly
-      placed into an if block and not executed. The check was moved into
-      the normal path of the function.
-
-      (ADB - 2018/02/21, HDFFV-10412)
-
-    - h5dump
-
-      the tools library will hide the error stack during file open.
-
-      While this is preferable almost always, there are reasons to enable
-      display of the error stack when a tool will not open a file. Adding an
-      optional argument to the --enable-error-stack will provide this use case.
-      As an optional argument it will not affect the operation of the
-      --enable-error-stack. h5dump is the only tool to implement this change.
-
-      (ADB - 2018/02/15, HDFFV-10384)
-
-    - h5dump
-
-      h5dump would output an indented blank line in the filters section.
-
-      h5dump overused the h5tools_simple_prefix function, which is a
-      function intended to account for the data index (x,y,z) option.
-      Removed the function call for header information.
-
-      (ADB - 2018/01/25, HDFFV-10396)
-
-    - h5repack
-
-      h5repack incorrectly searched internal object table for name.
-
-      h5repack would search the table of objects for a name, if the
-      name did not match it tried to determine if the name without a
-      leading slash would match. The logic was flawed! The table
-      stored names(paths) without a leading slash and did a strstr
-      of the table path to the name.
-      The assumption was that if there was a difference of one then
-      it was a match, however "pressure" would match "/pressure" as
-      well as "/pressure1", "/pressure2", etc. Changed logic to remove
-      any leading slash and then do a full compare of the name.
-
-      (ADB - 2018/01/18, HDFFV-10393)
-
-    - h5repack
-
-      h5repack failed to handle more then 9 chars for int conversion.
-
-      User defined filter parameter conversions would fail for integers
-      larger then 9 characters. Increased local variable array for storing
-      the current command line parameter to prevent buffer overflows.
-
-      (ADB - 2018/01/17, HDFFV-10392)
-
-    - h5diff
-
-      h5diff seg-faulted if comparing VL strings against fixed strings.
-
-      Reworked solution for HDFFV-8625 and HDFFV-8639. Implemented the check
-      for string objects of same type in the diff_can_type function by
-      adding an if(tclass1 == H5T_STRING) block. This if block moves the
-      same check that was added for attributes to this function, which is
-      used by all object types. This function also handles complex type
-      structures.
-      Also added a new test file in h5diffgenttest for testing this issue
-      and removed the temporary files used in the test scripts.
-
-      (ADB - 2018/01/04, HDFFV-8745)
-
+    - None
 
 
     Fortran API
@@ -432,32 +132,7 @@ Bug Fixes since HDF5-1.8.20
 
     C++ API
     -------
-    - Removal of memory leaks
-
-      A private function was inadvertently called, causing memory leaks.  This
-      is now fixed.
-
-      (BMR - 2018/04/12 - User reported in email)
-
-    - Changes in exception classes
-
-      Some exception classes are reorganized to reflect the HDF5 object
-      hierarchy and allow customization.
-        DataSetIException -> LocationException -> Exception
-        DataTypeIException -> LocationException -> Exception
-        GroupIException -> LocationException -> Exception
-        AttributeIException -> LocationException -> Exception
-        FileIException -> GroupIException -> LocationException -> Exception
-      Member functions in H5Location and H5Object now throw specific exceptions
-      associated with the invoking objects.
-
-      (BMR - 2018/05/11)
-
-    - H5Location::closeObjId is made static
-      (BMR - 2018/05/11)
-
-    - H5A wrappers in H5Location are removed as they have been in H5Object.
-      (BMR - 2018/05/11)
+    - None
 
 
     High-Level APIs:
diff --git a/src/H5public.h b/src/H5public.h
index 6007f16..b2c72c2 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -92,10 +92,10 @@ extern "C" {
 /* Version numbers */
 #define H5_VERS_MAJOR	1	/* For major interface/format changes  	     */
 #define H5_VERS_MINOR	8	/* For minor interface/format changes  	     */
-#define H5_VERS_RELEASE	21	/* For tweaks, bug-fixes, or development     */
-#define H5_VERS_SUBRELEASE "snap13"	/* For pre-releases like snap0       */
+#define H5_VERS_RELEASE	22	/* For tweaks, bug-fixes, or development     */
+#define H5_VERS_SUBRELEASE ""	/* For pre-releases like snap0       */
 				/* Empty string for real releases.           */
-#define H5_VERS_INFO    "HDF5 library version: 1.8.21-snap13"      /* Full version string */
+#define H5_VERS_INFO    "HDF5 library version: 1.8.22"      /* Full version string */
 
 #define H5check()	H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,	      \
 				        H5_VERS_RELEASE)
diff --git a/tools/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl b/tools/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl
index e8ac9a4..08fd4aa 100644
--- a/tools/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl
+++ b/tools/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl
@@ -11,7 +11,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 260
             COMMENT dynlib4
-            PARAMS { 9 1 8 21 }
+            PARAMS { 9 1 8 22 }
          }
       }
       FILLVALUE {
@@ -33,7 +33,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 260
             COMMENT dynlib4
-            PARAMS { 9 1 8 21 }
+            PARAMS { 9 1 8 22 }
          }
       }
       FILLVALUE {
@@ -55,7 +55,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 260
             COMMENT dynlib4
-            PARAMS { 9 1 8 21 }
+            PARAMS { 9 1 8 22 }
          }
       }
       FILLVALUE {
@@ -77,7 +77,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 260
             COMMENT dynlib4
-            PARAMS { 9 1 8 21 }
+            PARAMS { 9 1 8 22 }
          }
       }
       FILLVALUE {
@@ -99,7 +99,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 260
             COMMENT dynlib4
-            PARAMS { 9 1 8 21 }
+            PARAMS { 9 1 8 22 }
          }
       }
       FILLVALUE {
@@ -121,7 +121,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 260
             COMMENT dynlib4
-            PARAMS { 9 1 8 21 }
+            PARAMS { 9 1 8 22 }
          }
       }
       FILLVALUE {
@@ -143,7 +143,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 260
             COMMENT dynlib4
-            PARAMS { 9 1 8 21 }
+            PARAMS { 9 1 8 22 }
          }
       }
       FILLVALUE {