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_60.txt
+++ b/tools/test/h5diff/testfiles/h5diff_60.txt
@@ -2,8 +2,8 @@ dataset: </string1> and </string1>
 size:           [3x4]           [3x4]
 position        string1         string1         difference          
 ------------------------------------------------------------
-[ 1 0 ]            5            \000
-[ 1 1 ]            6            \000
+[ 1 0 ]            \000            5
+[ 1 1 ]            \000            6
 [ 1 2 ]            \000            7
 [ 1 3 ]            \000            8
 4 differences found