refresh

diff --git a/meta b/meta
index 56c43d812781f2c542a28907255f7f7418fffe79..c1dd3c8175237a79e84643a80fab9b718c0796c4 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: da278d9750574dd39bb561ffc6f452901c608956
-Head: 66b0dadecfd2417afef7e149de80ddef6b998058
+Previous: 9d0fd2bd5743cb49466d69b5fb027955d1d42aff
+Head: 90b41e985e1f478cda3e4821709cb2ed5e27ee7f
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -13,8 +13,7 @@ Applied:
   dbg_1: 3258ebd9b3f17653231089184f29ee2352be9d46
   no_addr: 775cf275e0feddd7b884ded8cdc341a919e4f9a6
   log_port: 92f81cd1f299db9d83aa21d794cfdfc4c4b5794f
-  nodelay: 8fd9f7f3d46b6a08f06c6fd4e725d02118b3be90
-  refresh-temp: 66b0dadecfd2417afef7e149de80ddef6b998058
+  nodelay: 90b41e985e1f478cda3e4821709cb2ed5e27ee7f
 Unapplied:
   acme_dest: f5cc9c1794700bda0a62967250a00ea9bae5839e
   show_err: aadb98a10bf5192f36dba186eefb696794864ad6

diff --git a/patches/nodelay b/patches/nodelay
index 1343643f5b8fb8924af24d44f32c67bce0598285..431a76b5c4abee984d114d28c62c2287d8813cbb 100644 (file)
--- a/patches/nodelay
+++ b/patches/nodelay
@@ -1,5 +1,5 @@
 Bottom: 5cb19eb81ed40ac6bba59f5d10974e9fc25a49af
-Top:    adca8d637b4f5537a0e81727a25fec931a002965
+Top:    a26298c8af16d66ba9e4959cbc2f81521bf16570
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-06 13:07:41 -0800
 
@@ -99,7 +99,7 @@ index ceb72f6..0a9c1c9 100644
                if (status) {
                        break;
 diff --git a/src/acme.c b/src/acme.c
-index cc34577..3ee2073 100644
+index cc34577..daa6051 100644
 --- a/src/acme.c
 +++ b/src/acme.c
 @@ -51,6 +51,7 @@ static char *dest_addr;
@@ -114,7 +114,7 @@ index cc34577..3ee2073 100644
        printf("   -s src_addr      - format defined by -f option\n");
        printf("   -d dest_addr     - format defined by -f option\n");
        printf("   [-v]             - verify ACM response against SA query response\n");
-+      printf("   [-c]             - read ACM cached data only\n")
++      printf("   [-c]             - read ACM cached data only\n");
        printf("usage 2: %s\n", program);
        printf("   -A [addr_file]   - generate local address configuration file\n");
        printf("                      (default is %s)\n", ACM_ADDR_FILE);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 55a7a18..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: adca8d637b4f5537a0e81727a25fec931a002965
-Top:    a26298c8af16d66ba9e4959cbc2f81521bf16570
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-07 09:19:16 -0800
-
-Refresh of nodelay
-
----
-
-diff --git a/src/acme.c b/src/acme.c
-index 3ee2073..daa6051 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -71,7 +71,7 @@ static void show_usage(char *program)
-       printf("   -s src_addr      - format defined by -f option\n");
-       printf("   -d dest_addr     - format defined by -f option\n");
-       printf("   [-v]             - verify ACM response against SA query response\n");
--      printf("   [-c]             - read ACM cached data only\n")
-+      printf("   [-c]             - read ACM cached data only\n");
-       printf("usage 2: %s\n", program);
-       printf("   -A [addr_file]   - generate local address configuration file\n");
-       printf("                      (default is %s)\n", ACM_ADDR_FILE);