diff --git a/CHANGES b/CHANGES index 4a60a0bede..47fd528c20 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,17 @@ +2.5-900 | 2018-08-23 15:18:48 -0500 + + * Improve readability of the Travis job log (Daniel Thayer) + + * Fix tracking of DCE-RPC context identifier mappings + + This adds previously-missing support for "Alter Context" + request/response PDUs (initial patch contributed by Mark Fernandez). + + Also, context ID arguments were added to dce_rpc_bind, dce_rpc_request, + and dce_rpc_response in order to properly track what endpoint/operation + a given opnum maps to. (Jon Siwek, Corelight) + 2.5-897 | 2018-08-23 15:53:16 +0000 * BIT-1885: Fix input framework memory leak. For input threads that diff --git a/VERSION b/VERSION index 18f5be6a90..4dc4e31e6a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5-897 +2.5-900 diff --git a/testing/external/commit-hash.bro-testing-private b/testing/external/commit-hash.bro-testing-private index 877d2bd8ac..3375ace0c2 100644 --- a/testing/external/commit-hash.bro-testing-private +++ b/testing/external/commit-hash.bro-testing-private @@ -1 +1 @@ -ec454469578db00176db08a60363e99cdf1867f3 +1917c0c602b18aa52150c7a940e9038a4382aa44 diff --git a/testing/scripts/travis-job b/testing/scripts/travis-job index d3661b363c..6edf13922a 100644 --- a/testing/scripts/travis-job +++ b/testing/scripts/travis-job @@ -199,15 +199,21 @@ run() { fi if [ -d bro-testing ]; then - ( cd bro-testing && git checkout `cat ../commit-hash.bro-testing` ) + commit=`cat commit-hash.bro-testing` + echo "Checking out $commit" + ( cd bro-testing && git checkout -q $commit ) fi + echo + if [ ! -d bro-testing-private ]; then get_private_tests fi if [ -d bro-testing-private ]; then - ( cd bro-testing-private && git checkout `cat ../commit-hash.bro-testing-private` ) + commit=`cat commit-hash.bro-testing-private` + echo "Checking out $commit" + ( cd bro-testing-private && git checkout -q $commit ) fi echo