Auto commit, grsecurity-3.1-4.9.16-201703180820.patch added.

[thirdparty/grsecurity-scrape.git] / test / changelog-test.txt

diff --git a/test/changelog-test.txt b/test/changelog-test.txt
index 8b0175c358eb413023420425245e8fffc7aa241c..0982e4bd65efdf645643dbd0c0d6f6b0b99e7b61 100644 (file)
--- a/test/changelog-test.txt
+++ b/test/changelog-test.txt
@@ -1,3 +1,17 @@
+commit 0ce9a7532015fd64e56ff017bac5448719c6caa8
+Merge: 3648fb5 28fc0cc
+Author: Brad Spengler <spender@grsecurity.net>
+Date:   Sat Mar 18 07:41:49 2017 -0400
+
+    Merge branch 'pax-test' into grsec-test
+
+commit 28fc0cc540a02524aa7122c4b6518f46be150670
+Merge: 51fb02c 8a16224
+Author: Brad Spengler <spender@grsecurity.net>
+Date:   Sat Mar 18 07:41:36 2017 -0400
+
+    Merge branch 'linux-4.9.y' into pax-test
+

 commit 3648fb58cc16ec3a1c86269ffbdf6ee8f2ff857d
 Author: Brad Spengler <spender@grsecurity.net>
 Date:   Wed Mar 15 00:10:53 2017 -0400
 commit 3648fb58cc16ec3a1c86269ffbdf6ee8f2ff857d
 Author: Brad Spengler <spender@grsecurity.net>
 Date:   Wed Mar 15 00:10:53 2017 -0400