pop

diff --git a/meta b/meta
index c1dd3c8175237a79e84643a80fab9b718c0796c4..4d2bd2ab3346c171dd9ea099384dcda059b2ade4 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 9d0fd2bd5743cb49466d69b5fb027955d1d42aff
-Head: 90b41e985e1f478cda3e4821709cb2ed5e27ee7f
+Previous: a74635ccb026842f3f980aaebf08af9214a1d761
+Head: fd58d9ca3871391b52de18f762ed295b9c3470c1
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -14,8 +14,8 @@ Applied:
   no_addr: 775cf275e0feddd7b884ded8cdc341a919e4f9a6
   log_port: 92f81cd1f299db9d83aa21d794cfdfc4c4b5794f
   nodelay: 90b41e985e1f478cda3e4821709cb2ed5e27ee7f
+  acme_dest: fd58d9ca3871391b52de18f762ed295b9c3470c1
 Unapplied:
-  acme_dest: f5cc9c1794700bda0a62967250a00ea9bae5839e
   show_err: aadb98a10bf5192f36dba186eefb696794864ad6
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37
 Hidden:

diff --git a/patches/acme_dest b/patches/acme_dest
index 886ad598ad8d42bbee2b0137fd07844a36f1a70e..0a311a0733fda4131776d13b54ddd63ca6072bd4 100644 (file)
--- a/patches/acme_dest
+++ b/patches/acme_dest
@@ -1,5 +1,5 @@
-Bottom: 6b1a8889e0c9bde043dfd2126fed3c613bff07a0
-Top:    f141944c9884ee22acc7dfcfeed6b44674772b46
+Bottom: a26298c8af16d66ba9e4959cbc2f81521bf16570
+Top:    1a6976aae5afc51f4482c9392f83f24867e54446
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-06 16:13:22 -0800
 
@@ -28,10 +28,10 @@ index 52000a3..56c49f0 100644
  .nf\r
  \fIib_acme\fR [-G] [-O]\r
 diff --git a/src/acme.c b/src/acme.c
-index 3ee2073..a75ef34 100644
+index daa6051..a75ef34 100644
 --- a/src/acme.c
 +++ b/src/acme.c
-@@ -68,10 +68,10 @@ static void show_usage(char *program)
+@@ -68,7 +68,7 @@ static void show_usage(char *program)
        printf("usage 1: %s\n", program);
        printf("   [-f addr_format] - i(p), n(ame), or l(id)\n");
        printf("                      default: 'i'\n");
@@ -39,11 +39,7 @@ index 3ee2073..a75ef34 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);
+       printf("   [-c]             - read ACM cached data only\n");
 @@ -434,13 +434,19 @@ static int resolve_ip(struct ibv_path_record *path)
  {
        struct ibv_path_data *paths;