Auto commit, grsecurity-3.1-4.9.18-201703261106.patch added.

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

diff --git a/test/changelog-test.txt b/test/changelog-test.txt
index 01a858282dfc288e0362f5905cfc266b837590f9..321b29c95408cef285226e7a09395c4faff07dcf 100644 (file)
--- a/test/changelog-test.txt
+++ b/test/changelog-test.txt
@@ -1,3 +1,17 @@
+commit 6abbeb8072ced7907c3a4294f5ec254313302279
+Merge: a22b234 3097d09
+Author: Brad Spengler <spender@grsecurity.net>
+Date:   Sun Mar 26 08:32:58 2017 -0400
+
+    Merge branch 'pax-test' into grsec-test
+
+commit 3097d09221297acf1b57a5d4dcd254de9d1087bc
+Merge: 693fcec4 2a48626
+Author: Brad Spengler <spender@grsecurity.net>
+Date:   Sun Mar 26 08:32:46 2017 -0400
+
+    Merge branch 'linux-4.9.y' into pax-test
+
 commit a22b23469f57e80488a78689830a45cb27a020e3
 Merge: 0ce9a75 693fcec4
 Author: Brad Spengler <spender@grsecurity.net>