refresh

diff --git a/meta b/meta
index 6a6464ac3dbfcebcd3fbd9142ec938cbe25a310b..4521db4e104f3458bdc88c1ce8f5152bc4ab6ef4 100644 (file)
--- a/meta
+++ b/meta
@@ -1,14 +1,13 @@
 Version: 1
-Previous: 5762fac8fdaa926ebf7a8431b959c52e3bc9c17a
-Head: fd8c8abe34484766c27dac7e1aacfc84b1e2d95f
+Previous: 50832c87b9726bf265d3fe2d0656aa34234bdeff
+Head: d33305b5848518e4616dd26f2827c580fd5034f6
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
   loop: 1e219f58eafc1fb4f035e67e90d88b5b69d44c16
   fix-text: 6d9535384c392e24b6820e6de50112b39883fe56
   dist-cfg: 1e9fcfee450ca11bdb5cbcab7e4024f14deccf31
-  lower_retries: 6e729cc54373a79464bbb26f66eea130becb19d8
-  refresh-temp: fd8c8abe34484766c27dac7e1aacfc84b1e2d95f
+  lower_retries: d33305b5848518e4616dd26f2827c580fd5034f6
 Unapplied:
   1.0.4: db24cd6696165aaa0710030188e77be4d6b4cbfd
 Hidden:

diff --git a/patches/lower_retries b/patches/lower_retries
index a24d84083f03f37eb706cacd396610ee3e469ed4..5dc1684a2440b2cc894d7d9b3b54a8d35c08d8bb 100644 (file)
--- a/patches/lower_retries
+++ b/patches/lower_retries
@@ -1,5 +1,5 @@
 Bottom: 373094ca753531b7dc76712d64a4a7efec7212b5
-Top:    7e7ebdc1e3ec2f10946795e454eb68b35e22ec44
+Top:    dbfdf6b9c93daaf62e352c35bb0183c3b5668f98
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-30 19:38:15 -0800
 
@@ -28,10 +28,32 @@ index a9319f2..f1f079c 100644
  \r
  # send_depth:\r
  # Specifies the maximum number of outstanding requests that can be in\r
+diff --git a/src/acm.c b/src/acm.c
+index 099518e..3152392 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -213,7 +213,7 @@ static enum acm_route_prot route_prot = ACM_ROUTE_PROT_ACM;
+ static enum acm_loopback_prot loopback_prot = ACM_LOOPBACK_PROT_LOCAL;
+ static short server_port = 6125;
+ static int timeout = 2000;
+-static int retries = 15;
++static int retries = 2;
+ static int resolve_depth = 1;
+ static int sa_depth = 1;
+ static int send_depth = 1;
 diff --git a/src/acme.c b/src/acme.c
-index 9c4aa8d..4deea47 100644
+index 9c4aa8d..218dbe8 100644
 --- a/src/acme.c
 +++ b/src/acme.c
+@@ -101,7 +101,7 @@ static void gen_opts_temp(FILE *f)
+       fprintf(f, "# Indicates the amount of detailed data written to the log file.  Log levels\n");
+       fprintf(f, "# should be one of the following values:\n");
+       fprintf(f, "# 0 - basic configuration & errors\n");
+-      fprintf(f, "# 1 - verbose configuation & errors\n");
++      fprintf(f, "# 1 - verbose configuration & errors\n");
+       fprintf(f, "# 2 - verbose operation\n");
+       fprintf(f, "\n");
+       fprintf(f, "log_level 0\n");
 @@ -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");

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 2d64b27..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,35 +0,0 @@
-Bottom: 7e7ebdc1e3ec2f10946795e454eb68b35e22ec44
-Top:    dbfdf6b9c93daaf62e352c35bb0183c3b5668f98
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-01 14:55:26 -0800
-
-Refresh of lower_retries
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 099518e..3152392 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -213,7 +213,7 @@ static enum acm_route_prot route_prot = ACM_ROUTE_PROT_ACM;
- static enum acm_loopback_prot loopback_prot = ACM_LOOPBACK_PROT_LOCAL;
- static short server_port = 6125;
- static int timeout = 2000;
--static int retries = 15;
-+static int retries = 2;
- static int resolve_depth = 1;
- static int sa_depth = 1;
- static int send_depth = 1;
-diff --git a/src/acme.c b/src/acme.c
-index 4deea47..218dbe8 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -101,7 +101,7 @@ static void gen_opts_temp(FILE *f)
-       fprintf(f, "# Indicates the amount of detailed data written to the log file.  Log levels\n");
-       fprintf(f, "# should be one of the following values:\n");
-       fprintf(f, "# 0 - basic configuration & errors\n");
--      fprintf(f, "# 1 - verbose configuation & errors\n");
-+      fprintf(f, "# 1 - verbose configuration & errors\n");
-       fprintf(f, "# 2 - verbose operation\n");
-       fprintf(f, "\n");
-       fprintf(f, "log_level 0\n");