commit

diff --git a/meta b/meta
index ad83206abaf241f8bb7f41360ddc4553c33f7233..1181982cb05f65a636449fa929442cc361eba1f5 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 98708e9f65231d1c093928c11e63bb41e680fd5e
+Previous: bef6ecb76573afd318e47520024479baf5f6f133
 Head: 77c6fc6fba7460ad73253bcb2e6f448b71399b5c
 Applied:
-  sa: 4360bd4a4279fa5f6c83f7d9bfeee9d1a46c6904
   sbin: ddfcfe3b90693d65f63b3a172923fff844dce1f9
   rel1.0.1: 77c6fc6fba7460ad73253bcb2e6f448b71399b5c
 Unapplied:

diff --git a/patches/sa b/patches/sa
deleted file mode 100644 (file)
index 2fa8d42..0000000
--- a/patches/sa
+++ /dev/null
@@ -1,40 +0,0 @@
-Bottom: 9593c1ec8c636dfc98ed635f95b248f4373c2065
-Top:    dbd88d4c36330147abc852e6fd09aca32695d270
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-02 11:55:25 -0700
-
-ibacm/acme: set default route protocol to SA queries
-
-Change the default routing lookup to use SA queries.
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/acm_opts.cfg b/acm_opts.cfg
-index 9e0ff0e..95ac15a 100644
---- a/acm_opts.cfg
-+++ b/acm_opts.cfg
-@@ -41,7 +41,7 @@ addr_prot acm
- # sa - Query SA for path record data and cache results.\r
- # acm - Use ACM multicast protocol.\r
- \r
--route_prot acm\r
-+route_prot sa\r
- \r
- # server_port:\r
- # TCP port number that the server listens on.\r
-diff --git a/src/acme.c b/src/acme.c
-index 13b852a..5a5a09a 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -109,7 +109,7 @@ static void gen_opts_temp(FILE *f)
-       fprintf(f, "# sa - Query SA for path record data and cache results.\n");
-       fprintf(f, "# acm - Use ACM multicast protocol.\n");
-       fprintf(f, "\n");
--      fprintf(f, "route_prot acm\n");
-+      fprintf(f, "route_prot sa\n");
-       fprintf(f, "\n");
-       fprintf(f, "# server_port:\n");
-       fprintf(f, "# TCP port number that the server listens on.\n");