HDFFV-10297 Merge from develop

2017-10-18 16:37:49 -05:00
parent 6029b679a3
commit 0b3b55f791
56 changed files with 4952 additions and 5057 deletions
--- a/tools/test/h5diff/testfiles/h5diff_457_ERR.err
+++ b/tools/test/h5diff/testfiles/h5diff_457_ERR.err
@@ -1,4 +1,4 @@
 H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
-  #000: (file name) line (number) in h5diff(): Error: treat dangling link as error
+  #000: (file name) line (number) in h5diff(): treat dangling link as error
    major: Failure in tools library
    minor: error in function