refresh

diff --git a/meta b/meta
index f86fb9fc90183d78e6aee1c41eb9c4e4636c275c..48e31472cccf9a97978764b852697194dfa66ef7 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 7348551e07dd5d741bf0d4c68a72bbe14e1c8794
-Head: 2416d7119821683a46aa1321ece159eab3607cb3
+Previous: 37a94a63d23079bdc5253031da80c42f402e73ef
+Head: 6d9535384c392e24b6820e6de50112b39883fe56
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
   loop: 1e219f58eafc1fb4f035e67e90d88b5b69d44c16
-  fix-text: f94670f547ca7cd9085906917491dd3345753ae2
-  refresh-temp: 2416d7119821683a46aa1321ece159eab3607cb3
+  fix-text: 6d9535384c392e24b6820e6de50112b39883fe56
 Unapplied:
   1.0.4: fef38bbaaa183e1fcbeb96f0229f9bf2360c78e6
 Hidden:

diff --git a/patches/fix-text b/patches/fix-text
index 2c8b58da2a2218ced67da66b7a028a74c33fbe13..ef9b21c0a0c1abce8560308bc3657c477412a26d 100644 (file)
--- a/patches/fix-text
+++ b/patches/fix-text
@@ -1,5 +1,5 @@
 Bottom: 7fffdf6024c787b6b6d1c93dd896c4818d9d1169
-Top:    7fffdf6024c787b6b6d1c93dd896c4818d9d1169
+Top:    2ade29ce3f23fc9eb785f9810ca0b437d7a23a8c
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-30 19:29:15 -0800
 
@@ -10,4 +10,29 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/acm_opts.cfg b/acm_opts.cfg
+index 65faac9..a9319f2 100644
+--- a/acm_opts.cfg
++++ b/acm_opts.cfg
+@@ -94,7 +94,7 @@ recv_depth 1024
+ \r
+ min_mtu 2048\r
+ \r
+-#min_rate:\r
++# min_rate:\r
+ # Indicates the minimum link rate, in Gbps, supported by the ACM service.\r
+ # The ACM service negotiates to use the highest rate available between both\r
+ # sides of a connection.  It is most efficient and recommended that the\r
+diff --git a/src/acme.c b/src/acme.c
+index b54738e..9c4aa8d 100644
+--- a/src/acme.c
++++ b/src/acme.c
+@@ -194,7 +194,7 @@ static void gen_opts_temp(FILE *f)
+       fprintf(f, "\n");
+       fprintf(f, "min_mtu 2048\n");
+       fprintf(f, "\n");
+-      fprintf(f, "#min_rate:\n");
++      fprintf(f, "# min_rate:\n");
+       fprintf(f, "# Indicates the minimum link rate, in Gbps, supported by the ACM service.\n");
+       fprintf(f, "# The ACM service negotiates to use the highest rate available between both\n");
+       fprintf(f, "# sides of a connection.  It is most efficient and recommended that the\n");

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 28fb537..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,35 +0,0 @@
-Bottom: 7fffdf6024c787b6b6d1c93dd896c4818d9d1169
-Top:    2ade29ce3f23fc9eb785f9810ca0b437d7a23a8c
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-30 19:29:44 -0800
-
-Refresh of fix-text
-
----
-
-diff --git a/acm_opts.cfg b/acm_opts.cfg
-index 65faac9..a9319f2 100644
---- a/acm_opts.cfg
-+++ b/acm_opts.cfg
-@@ -94,7 +94,7 @@ recv_depth 1024
- \r
- min_mtu 2048\r
- \r
--#min_rate:\r
-+# min_rate:\r
- # Indicates the minimum link rate, in Gbps, supported by the ACM service.\r
- # The ACM service negotiates to use the highest rate available between both\r
- # sides of a connection.  It is most efficient and recommended that the\r
-diff --git a/src/acme.c b/src/acme.c
-index b54738e..9c4aa8d 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -194,7 +194,7 @@ static void gen_opts_temp(FILE *f)
-       fprintf(f, "\n");
-       fprintf(f, "min_mtu 2048\n");
-       fprintf(f, "\n");
--      fprintf(f, "#min_rate:\n");
-+      fprintf(f, "# min_rate:\n");
-       fprintf(f, "# Indicates the minimum link rate, in Gbps, supported by the ACM service.\n");
-       fprintf(f, "# The ACM service negotiates to use the highest rate available between both\n");
-       fprintf(f, "# sides of a connection.  It is most efficient and recommended that the\n");