Auto commit, grsecurity-3.1-4.9.17-201703221829.patch added.

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

diff --git a/test/changelog-test.txt b/test/changelog-test.txt
index 0982e4bd65efdf645643dbd0c0d6f6b0b99e7b61..01a858282dfc288e0362f5905cfc266b837590f9 100644 (file)
--- a/test/changelog-test.txt
+++ b/test/changelog-test.txt
@@ -1,3 +1,17 @@
+commit a22b23469f57e80488a78689830a45cb27a020e3
+Merge: 0ce9a75 693fcec4
+Author: Brad Spengler <spender@grsecurity.net>
+Date:   Wed Mar 22 07:59:35 2017 -0400
+
+    Merge branch 'pax-test' into grsec-test
+
+commit 693fcec4eaafc0a87b26fedf680d925455233a5f
+Merge: 28fc0cc c3825da
+Author: Brad Spengler <spender@grsecurity.net>
+Date:   Wed Mar 22 07:59:28 2017 -0400
+
+    Merge branch 'linux-4.9.y' into pax-test
+
 commit 0ce9a7532015fd64e56ff017bac5448719c6caa8
 Merge: 3648fb5 28fc0cc
 Author: Brad Spengler <spender@grsecurity.net>