refresh

diff --git a/meta b/meta
index 27b2a23367d2212488661f9388fffb539269a919..9f90fbb95ff446c11cb49b168bb115f26eb159a4 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: f191ed3bb766b3d97b862327fa3141fc762e13dd
-Head: e83390652d94846323725f6ad935e133fe77dc08
+Previous: 554954c3cd68e5983eda956ee8bcc617cdcc0c2d
+Head: b7ec8fce4adac1b6e970529e41ff1c936f4be27b
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -14,8 +14,7 @@ Applied:
   no_addr: 775cf275e0feddd7b884ded8cdc341a919e4f9a6
   log_port: 92f81cd1f299db9d83aa21d794cfdfc4c4b5794f
   nodelay: 90b41e985e1f478cda3e4821709cb2ed5e27ee7f
-  acme_dest: fd58d9ca3871391b52de18f762ed295b9c3470c1
-  refresh-temp: e83390652d94846323725f6ad935e133fe77dc08
+  acme_dest: b7ec8fce4adac1b6e970529e41ff1c936f4be27b
 Unapplied:
   show_err: b0d033ea75904f706f93942cd281875b1c5e28f5
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37

diff --git a/patches/acme_dest b/patches/acme_dest
index 0a311a0733fda4131776d13b54ddd63ca6072bd4..86bd0a429da691dce050a5781893b61f934066a3 100644 (file)
--- a/patches/acme_dest
+++ b/patches/acme_dest
@@ -1,5 +1,5 @@
 Bottom: a26298c8af16d66ba9e4959cbc2f81521bf16570
-Top:    1a6976aae5afc51f4482c9392f83f24867e54446
+Top:    9fdabc325eba3a5ebf30ecea2f042a5c6f338ef4
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-06 16:13:22 -0800
 
@@ -92,7 +92,7 @@ index daa6051..a75ef34 100644
  
        if (!ret && make_addr)
 diff --git a/src/libacm.c b/src/libacm.c
-index 59a181b..d32e749 100644
+index 59a181b..ee8c07b 100644
 --- a/src/libacm.c
 +++ b/src/libacm.c
 @@ -113,6 +113,7 @@ static int acm_format_resp(struct acm_resolve_msg *msg,
@@ -124,7 +124,7 @@ index 59a181b..d32e749 100644
 +                      default:
 +                              goto err;
 +                      }
-+                      printf("source: %s\n", addr);
++                      printf("Source: %s\n", addr);
 +                      break;
                }
        }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index c9ded75..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 1a6976aae5afc51f4482c9392f83f24867e54446
-Top:    9fdabc325eba3a5ebf30ecea2f042a5c6f338ef4
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-07 09:33:54 -0800
-
-Refresh of acme_dest
-
----
-
-diff --git a/src/libacm.c b/src/libacm.c
-index d32e749..ee8c07b 100644
---- a/src/libacm.c
-+++ b/src/libacm.c
-@@ -148,7 +148,7 @@ static int acm_format_resp(struct acm_resolve_msg *msg,
-                       default:
-                               goto err;
-                       }
--                      printf("source: %s\n", addr);
-+                      printf("Source: %s\n", addr);
-                       break;
-               }
-       }