refresh

diff --git a/meta b/meta
index b41d11058012ebfd87187772e0f9f3c69d2ffe8a..bfdea7c50ab57f9720362bb99768363fb19bd02f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,14 +1,13 @@
 Version: 1
-Previous: 40b3f1bf08d8fbc90b9d4785c785a9ea30b81cf6
-Head: 4228d8f6af6041f51417b82d2888ae060f92ec3c
+Previous: 25ecaf2872cec634bb73a0275c2d7a55d7480d06
+Head: 6e729cc54373a79464bbb26f66eea130becb19d8
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
   loop: 1e219f58eafc1fb4f035e67e90d88b5b69d44c16
   fix-text: 6d9535384c392e24b6820e6de50112b39883fe56
   dist-cfg: 1e9fcfee450ca11bdb5cbcab7e4024f14deccf31
-  dec-to: c30c1b51d0b789eaa932165f5880057ecba22c40
-  refresh-temp: 4228d8f6af6041f51417b82d2888ae060f92ec3c
+  dec-to: 6e729cc54373a79464bbb26f66eea130becb19d8
 Unapplied:
   1.0.4: db24cd6696165aaa0710030188e77be4d6b4cbfd
 Hidden:

diff --git a/patches/dec-to b/patches/dec-to
index 689641be4e03de851eeae8cbf995114da642fa8e..a24d84083f03f37eb706cacd396610ee3e469ed4 100644 (file)
--- a/patches/dec-to
+++ b/patches/dec-to
@@ -1,5 +1,5 @@
 Bottom: 373094ca753531b7dc76712d64a4a7efec7212b5
-Top:    373094ca753531b7dc76712d64a4a7efec7212b5
+Top:    7e7ebdc1e3ec2f10946795e454eb68b35e22ec44
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-30 19:38:15 -0800
 
@@ -15,4 +15,29 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/acm_opts.cfg b/acm_opts.cfg
+index a9319f2..f1f079c 100644
+--- a/acm_opts.cfg
++++ b/acm_opts.cfg
+@@ -67,7 +67,7 @@ timeout 2000
+ # Number of times that the ACM service will retry a request.  This affects\r
+ # both ACM multicast messages and and IB SA messages.\r
+ \r
+-retries 15\r
++retries 2\r
+ \r
+ # send_depth:\r
+ # Specifies the maximum number of outstanding requests that can be in\r
+diff --git a/src/acme.c b/src/acme.c
+index 9c4aa8d..4deea47 100644
+--- a/src/acme.c
++++ b/src/acme.c
+@@ -147,7 +147,7 @@ static void gen_opts_temp(FILE *f)
+       fprintf(f, "# Number of times that the ACM service will retry a request.  This affects\n");
+       fprintf(f, "# both ACM multicast messages and and IB SA messages.\n");
+       fprintf(f, "\n");
+-      fprintf(f, "retries 15\n");
++      fprintf(f, "retries 2\n");
+       fprintf(f, "\n");
+       fprintf(f, "# resolve_depth:\n");
+       fprintf(f, "# Specifies the maximum number of outstanding requests that can be in\n");

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 05c6646..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,35 +0,0 @@
-Bottom: 373094ca753531b7dc76712d64a4a7efec7212b5
-Top:    7e7ebdc1e3ec2f10946795e454eb68b35e22ec44
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-30 19:42:09 -0800
-
-Refresh of dec-to
-
----
-
-diff --git a/acm_opts.cfg b/acm_opts.cfg
-index a9319f2..f1f079c 100644
---- a/acm_opts.cfg
-+++ b/acm_opts.cfg
-@@ -67,7 +67,7 @@ timeout 2000
- # Number of times that the ACM service will retry a request.  This affects\r
- # both ACM multicast messages and and IB SA messages.\r
- \r
--retries 15\r
-+retries 2\r
- \r
- # send_depth:\r
- # Specifies the maximum number of outstanding requests that can be in\r
-diff --git a/src/acme.c b/src/acme.c
-index 9c4aa8d..4deea47 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -147,7 +147,7 @@ static void gen_opts_temp(FILE *f)
-       fprintf(f, "# Number of times that the ACM service will retry a request.  This affects\n");
-       fprintf(f, "# both ACM multicast messages and and IB SA messages.\n");
-       fprintf(f, "\n");
--      fprintf(f, "retries 15\n");
-+      fprintf(f, "retries 2\n");
-       fprintf(f, "\n");
-       fprintf(f, "# resolve_depth:\n");
-       fprintf(f, "# Specifies the maximum number of outstanding requests that can be in\n");