refresh

diff --git a/meta b/meta
index 5213b3f1b541a6ed9d3ef891589c4d362a604b38..67b3c15af476f05e891952d93e1c39c1b68f027b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 85d498d4756189f641ebf455b0a0b9a99b4973ab
-Head: adfd51c64a3a9739daff232a42bb0b9340710d85
+Previous: db61cf1d7ea1265189027b4a7ca8e50ba9223ff8
+Head: cdfedcc65d4744238c19de2dc3fbf4ce3acde365
 Applied:
   ofed: 4dd1e98bd219ab47737ef2ff681800c11e4d56cb
   sbin: 17db168e3614d6121f3f4bdd1c4f4bf3a939554a
-  sa: 9616e68e99862edad1566689cedec97550f92b5f
-  refresh-temp: adfd51c64a3a9739daff232a42bb0b9340710d85
+  sa: cdfedcc65d4744238c19de2dc3fbf4ce3acde365
 Unapplied:
   ibacm-release-1-0-1: 049bc06b1a959ffd0183dd421ce45ca506402d99
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 4fe3fd6..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,35 +0,0 @@
-Bottom: 8f832c4b995dc35d3fb1a25f84cf8609e7bbda3c
-Top:    cdc3cb57930cb5206ed76a1147721686da398779
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-02 11:56:10 -0700
-
-Refresh of sa
-
----
-
-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");

diff --git a/patches/sa b/patches/sa
index fc5d4078e28fe25ddae03ae1a49f6f3e127630fc..506ff0c398f1858aa4c96a03de30f438f6b52235 100644 (file)
--- a/patches/sa
+++ b/patches/sa
@@ -1,5 +1,5 @@
 Bottom: 8f832c4b995dc35d3fb1a25f84cf8609e7bbda3c
-Top:    8f832c4b995dc35d3fb1a25f84cf8609e7bbda3c
+Top:    cdc3cb57930cb5206ed76a1147721686da398779
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-02 11:55:25 -0700
 
@@ -12,4 +12,29 @@ 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");