refresh

diff --git a/meta b/meta
index 1e8392101bdea19ab741f510ed362c37c7516485..f81736e0b3bc3c031bbba3dbe448bd810c4ff59c 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: aeb2cc5414ad339b321e9840d76ca7592f4ff8fd
-Head: 1943bdb2d76104479ad272934a0dc7eeae2f7c8a
+Previous: 3dc13011f981c4dfb61b892622246f3da0b3def7
+Head: 1c8469be405d19304d47fcaf95e7d4aec574a6fc
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -16,8 +16,7 @@ Applied:
   nodelay: 90b41e985e1f478cda3e4821709cb2ed5e27ee7f
   acme_dest: b7ec8fce4adac1b6e970529e41ff1c936f4be27b
   show_err: 47d8e33e2f36df1e3b163fcf7e8b0b56604fb944
-  mult_dest: f07941f8e61b976c2d9cc7af9f62911cf17435c0
-  refresh-temp: 1943bdb2d76104479ad272934a0dc7eeae2f7c8a
+  mult_dest: 1c8469be405d19304d47fcaf95e7d4aec574a6fc
 Unapplied:
   addrinfo: ed58fc5d3b48278d09b7ee3b03b2aabe545bf7b4
   1.0.4: dc3f68d964641c9ffea14558d6a236c4216a89ae

diff --git a/patches/mult_dest b/patches/mult_dest
index 3ad0637dfde1f4b41442c58d99a38cf77bf4b008..221d892c6e411522c8abfae0ea56a59959b1c4b6 100644 (file)
--- a/patches/mult_dest
+++ b/patches/mult_dest
@@ -1,5 +1,5 @@
 Bottom: 32a7b8b2ffc23b410dc19c50a9bf68e149662635
-Top:    d6f69c04b4e914797d9eb22ea7b1a9dc8b4b1dd2
+Top:    ad882cbf5ccb5b39d50b3d141607e262852a2abd
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-07 09:39:52 -0800
 
@@ -33,22 +33,21 @@ index 957b016..dfe955e 100644
  util_ib_acme_CFLAGS = $(AM_CFLAGS)
  
 diff --git a/man/ib_acme.1 b/man/ib_acme.1
-index 56c49f0..de212fb 100644
+index 56c49f0..91d959d 100644
 --- a/man/ib_acme.1
 +++ b/man/ib_acme.1
-@@ -31,6 +31,12 @@ the addr_format option.
- Specifies the destination address of the path to resolve.  The destination\r
- address can be an IP address, system network name, or LID, as indicated by\r
- the addr_format option.\r
+@@ -70,5 +70,11 @@ network names, or IB LIDs into a path record.  It can then compare that
+ path record against one obtained by the SA.  When used to test the\r
+ ib_acm service, the ib_acme utility has the side effect of loading the\r
+ ib_acm caches.\r
 +.P\r
 +Multiple, numerical destinations can be specified by adding brackets [] to\r
 +the end of a base destination name or address.  Users may specify a list of\r
 +numerical ranges inside the brackets using the following example as a\r
 +guide: node[1-3,5,7-8].  This will result in testing node1, node2, node3,\r
 +node5, node7, and node8.   \r
- .TP\r
- \-v\r
- Indicates that the resolved path information should be verified with the\r
+ .SH "SEE ALSO"\r
+ ib_acm(7) ib_acm(1)\r
 diff --git a/src/acme.c b/src/acme.c
 index 7e1ca5e..6aa256a 100644
 --- a/src/acme.c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 324b672..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,38 +0,0 @@
-Bottom: d6f69c04b4e914797d9eb22ea7b1a9dc8b4b1dd2
-Top:    ad882cbf5ccb5b39d50b3d141607e262852a2abd
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-07 13:57:50 -0800
-
-Refresh of mult_dest
-
----
-
-diff --git a/man/ib_acme.1 b/man/ib_acme.1
-index de212fb..91d959d 100644
---- a/man/ib_acme.1
-+++ b/man/ib_acme.1
-@@ -31,12 +31,6 @@ the addr_format option.
- Specifies the destination address of the path to resolve.  The destination\r
- address can be an IP address, system network name, or LID, as indicated by\r
- the addr_format option.\r
--.P\r
--Multiple, numerical destinations can be specified by adding brackets [] to\r
--the end of a base destination name or address.  Users may specify a list of\r
--numerical ranges inside the brackets using the following example as a\r
--guide: node[1-3,5,7-8].  This will result in testing node1, node2, node3,\r
--node5, node7, and node8.   \r
- .TP\r
- \-v\r
- Indicates that the resolved path information should be verified with the\r
-@@ -76,5 +70,11 @@ network names, or IB LIDs into a path record.  It can then compare that
- path record against one obtained by the SA.  When used to test the\r
- ib_acm service, the ib_acme utility has the side effect of loading the\r
- ib_acm caches.\r
-+.P\r
-+Multiple, numerical destinations can be specified by adding brackets [] to\r
-+the end of a base destination name or address.  Users may specify a list of\r
-+numerical ranges inside the brackets using the following example as a\r
-+guide: node[1-3,5,7-8].  This will result in testing node1, node2, node3,\r
-+node5, node7, and node8.   \r
- .SH "SEE ALSO"\r
- ib_acm(7) ib_acm(1)