sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Tommy Boatman (d6b97ef6cd59fc0808f5c1128aefa64cf6f95caa)

From: Tommy Boatman <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Tommy Boatman (d6b97ef6cd59fc0808f5c1128aefa64cf6f95caa)
Date: Wed, 16 Nov 2011 15:39:03 -0600

GIT changes to master grimoire by Tommy Boatman <tboatman AT sourcemage.org>:

net/quagga/CONFLICTS | 2 +-
net/quagga/HISTORY | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit d6b97ef6cd59fc0808f5c1128aefa64cf6f95caa
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Tommy Boatman <tboatman AT sourcemage.org>

quagga: added "y" to zebra to force unattended cast

diff --git a/net/quagga/CONFLICTS b/net/quagga/CONFLICTS
index 05cd131..85a7250 100755
--- a/net/quagga/CONFLICTS
+++ b/net/quagga/CONFLICTS
@@ -1 +1 @@
-conflicts zebra
+conflicts zebra y
diff --git a/net/quagga/HISTORY b/net/quagga/HISTORY
index 86771ab..af15f7e 100644
--- a/net/quagga/HISTORY
+++ b/net/quagga/HISTORY
@@ -1,3 +1,6 @@
+2011-11-16 Tommy Boatman <tboatman AT sourcemage.org>
+ * CONFLICTS: added y to zebra conflict for autocast
+
2011-10-21 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: SECURITY_PATCH=1 (CVEs: 2011-3323, 2011-3324, 2011-3325,
2011-3326, 2011-3327, 2010-1674, 2010-1675 at least)

[SM-Commit] GIT changes to master grimoire by Tommy Boatman (d6b97ef6cd59fc0808f5c1128aefa64cf6f95caa), Tommy Boatman, 11/16/2011