diff --git a/CHANGES b/CHANGES index b6984e7583..59b35511d5 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.6-598 | 2019-07-12 18:20:12 -0700 + + * Fix canonification of timestamps with a decisecond multiple (Jon Siwek, Corelight) + 2.6-597 | 2019-07-12 15:01:56 -0700 * Fix a couple of resource leaks from JSON changes (Tim Wojtulewicz, Corelight) diff --git a/VERSION b/VERSION index cede10b3b8..eec6d0de55 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6-597 +2.6-598 diff --git a/testing/scripts/diff-remove-timestamps b/testing/scripts/diff-remove-timestamps index 325268d832..8ee28c29b9 100755 --- a/testing/scripts/diff-remove-timestamps +++ b/testing/scripts/diff-remove-timestamps @@ -9,5 +9,5 @@ else sed="sed -E" fi -$sed 's/(0\.000000)|([0-9]{9,10}\.[0-9]{2,8})/XXXXXXXXXX.XXXXXX/g' | \ +$sed 's/(0\.000000)|([0-9]{9,10}\.[0-9]{1,8})/XXXXXXXXXX.XXXXXX/g' | \ $sed 's/^ *#(open|close).(19|20)..-..-..-..-..-..$/#\1 XXXX-XX-XX-XX-XX-XX/g'