diff --git a/CHANGES b/CHANGES index 7bde326b16..bd46f4e65c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.5-722 | 2018-07-03 09:16:37 -0500 + + * BIT-1941: teach diff-remove-timestamps about time 0 (Corelight) + 2.5-721 | 2018-07-02 16:29:21 -0500 * BIT-1941: improve reliability of broker.disconnect unit test (Corelight) diff --git a/VERSION b/VERSION index a9a61666da..e1dbbe72b1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5-721 +2.5-722 diff --git a/testing/scripts/diff-remove-timestamps b/testing/scripts/diff-remove-timestamps index 44422f6f55..770a181c59 100755 --- a/testing/scripts/diff-remove-timestamps +++ b/testing/scripts/diff-remove-timestamps @@ -9,6 +9,5 @@ else sed="sed -E" fi -# The first sed uses a "basic" regexp, the 2nd a "modern:. -sed 's/[0-9]\{10\}\.[0-9]\{2,8\}/XXXXXXXXXX.XXXXXX/g' | \ +$sed 's/(0\.000000)|([0-9]{10}\.[0-9]{2,8})/XXXXXXXXXX.XXXXXX/g' | \ $sed 's/^ *#(open|close).(19|20)..-..-..-..-..-..$/#\1 XXXX-XX-XX-XX-XX-XX/g'