refresh

diff --git a/meta b/meta
index 513c0ce709f1e34d8e8b0f0b0bb7a695956cb30f..00394361b539da5f23c571f170a6cc7a6d29f474 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: c20a32f118702e471d7179680ee20cacb837fe82
-Head: 75bee58a61b073995da19e3fa364e46b0751a364
+Previous: 4fae0e15a17a5daf1ef280aff1099c6e521dfe8e
+Head: 045b8745bb159da2fdeee216007c10f1a058d547
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
-  rename-ibacm: e561b93ae45f3a930b78978723fa37e1d98645a5
-  refresh-temp: 75bee58a61b073995da19e3fa364e46b0751a364
+  rename-ibacm: 045b8745bb159da2fdeee216007c10f1a058d547
 Unapplied:
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index ba683e7..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,50 +0,0 @@
-Bottom: 5988260ae44191fb9e9ef4fcd0fe294df404610d
-Top:    2724258e9ed52f80159968b8b63216a7ba8595a6
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-03-01 16:53:38 -0800
-
-Refresh of rename-ibacm
-
----
-
-diff --git a/man/ib_acme.1 b/man/ib_acme.1
-index 9e44822..a00e64e 100644
---- a/man/ib_acme.1
-+++ b/man/ib_acme.1
-@@ -10,10 +10,10 @@ ib_acme \- test and configuration utility for the IB ACM
- \fIib_acme\fR [-G] [-O]\r
- .fi\r
- .SH "DESCRIPTION"\r
--ib_acme provides assistance configuring and testing the ib_acm service.\r
--The first usage of the service will test that the ib_acm is running\r
-+ib_acme provides assistance configuring and testing the ibacm service.\r
-+The first usage of the service will test that the ibacm is running\r
- and operating correctly.  The second usage model will automatically\r
--create address and configuration files for the ib_acm service.\r
-+create address and configuration files for the ibacm service.\r
- .SH "OPTIONS"\r
- .TP\r
- \-f addr_format\r
-@@ -64,13 +64,13 @@ generated files are text based and may be edited.  These options are intended
- to provide a simple way to configure address and option information on all\r
- nodes on a cluster.\r
- .P\r
--The other function of the ib_acme utility is to test the ib_acm service,\r
-+The other function of the ib_acme utility is to test the ibacm service,\r
- including helping to verify that the service is usable given the current\r
- cluster configuration.  The ib_acme utility can resolve IP addresses,\r
- network names, or IB LIDs into a path record.  It can then compare that\r
- 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
-+ibacm service, the ib_acme utility has the side effect of loading the\r
-+ibacm 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
-@@ -78,4 +78,4 @@ numerical ranges inside the brackets using the following example as a
- 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)\r
-+ib_acm(7) ibacm(1)

diff --git a/patches/rename-ibacm b/patches/rename-ibacm
index 3a249d3b61eda809b0a31e66434fd574ccb11b88..8b91231670a882bb8ec813e7d5f8c3d67319e4dd 100644 (file)
--- a/patches/rename-ibacm
+++ b/patches/rename-ibacm
@@ -1,5 +1,5 @@
 Bottom: 163f50499aea8749e94a5c93c4939e5f74ae1906
-Top:    5988260ae44191fb9e9ef4fcd0fe294df404610d
+Top:    2724258e9ed52f80159968b8b63216a7ba8595a6
 Author: Doug Ledford <dledford@redhat.com>
 Date:   2012-03-01 16:40:08 -0800
 
@@ -55,6 +55,47 @@ index 503ad72..2e71faa 100644
 +
  dist-hook: ibacm.spec
        cp ibacm.spec $(distdir)
+diff --git a/man/ib_acme.1 b/man/ib_acme.1
+index 9e44822..a00e64e 100644
+--- a/man/ib_acme.1
++++ b/man/ib_acme.1
+@@ -10,10 +10,10 @@ ib_acme \- test and configuration utility for the IB ACM
+ \fIib_acme\fR [-G] [-O]\r
+ .fi\r
+ .SH "DESCRIPTION"\r
+-ib_acme provides assistance configuring and testing the ib_acm service.\r
+-The first usage of the service will test that the ib_acm is running\r
++ib_acme provides assistance configuring and testing the ibacm service.\r
++The first usage of the service will test that the ibacm is running\r
+ and operating correctly.  The second usage model will automatically\r
+-create address and configuration files for the ib_acm service.\r
++create address and configuration files for the ibacm service.\r
+ .SH "OPTIONS"\r
+ .TP\r
+ \-f addr_format\r
+@@ -64,13 +64,13 @@ generated files are text based and may be edited.  These options are intended
+ to provide a simple way to configure address and option information on all\r
+ nodes on a cluster.\r
+ .P\r
+-The other function of the ib_acme utility is to test the ib_acm service,\r
++The other function of the ib_acme utility is to test the ibacm service,\r
+ including helping to verify that the service is usable given the current\r
+ cluster configuration.  The ib_acme utility can resolve IP addresses,\r
+ network names, or IB LIDs into a path record.  It can then compare that\r
+ 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
++ibacm service, the ib_acme utility has the side effect of loading the\r
++ibacm 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
+@@ -78,4 +78,4 @@ numerical ranges inside the brackets using the following example as a
+ 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)\r
++ib_acm(7) ibacm(1)\r
 diff --git a/man/ib_acm.1 b/man/ibacm.1
 similarity index 73%
 rename from man/ib_acm.1