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_udfail.txt
+++ b/tools/test/h5diff/testfiles/h5diff_udfail.txt
@@ -8,5 +8,5 @@ group  : </> and </>
 0 differences found
 dataset: </dynlibud> and </dynlibud>
 0 differences found
-warning: dataset </dynlibud> cannot be read, user defined filter is not available
+Warning: dataset </dynlibud> cannot be read, user defined filter is not available
 EXIT CODE: 2