refresh

diff --git a/meta b/meta
index cffa6b3dec032c0478011ba78ef2e394fefc57af..91e58f0a44f6b17dafe5066ba3acc4f726ad9ba3 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 3f2403413f4f366c24524804dc82b7c736878823
-Head: cdafe9c6057f4b87da8e48fbc69960d378dc6534
+Previous: bb4a9ed4b954a216aa9a64926bc9325f8aafcc4e
+Head: fef38bbaaa183e1fcbeb96f0229f9bf2360c78e6
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
   loop: 1e219f58eafc1fb4f035e67e90d88b5b69d44c16
-  1.0.4: 3145a3514dc99c6e3ce8e958f2f48fd6b4888516
-  refresh-temp: cdafe9c6057f4b87da8e48fbc69960d378dc6534
+  1.0.4: fef38bbaaa183e1fcbeb96f0229f9bf2360c78e6
 Unapplied:
 Hidden:

diff --git a/patches/1.0.4 b/patches/1.0.4
index a7b2bc88709aeb85c48554e11e194e621fd802e1..01eac3ef3ff570bcf2779962f1d20453b42c442c 100644 (file)
--- a/patches/1.0.4
+++ b/patches/1.0.4
@@ -1,5 +1,5 @@
 Bottom: 7fffdf6024c787b6b6d1c93dd896c4818d9d1169
-Top:    7fffdf6024c787b6b6d1c93dd896c4818d9d1169
+Top:    62aef5e752df47c12b82cef53c2e68347b58174f
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-29 15:02:45 -0800
 
@@ -10,4 +10,46 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/acm_notes.txt b/acm_notes.txt
+index 1eb6a62..4d20e71 100644
+--- a/acm_notes.txt
++++ b/acm_notes.txt
+@@ -23,7 +23,7 @@ implementation limits network traffic, SA interactions, and centralized
+ services.  ACM supports multiple resolution protocols in order to handle\r
+ different fabric topologies.\r
+ \r
+-This release 1.0.3 is limited in its handling of dynamic changes.\r
++This release is limited in its handling of dynamic changes.\r
+ \r
+ The IB ACM package is comprised of two components: the ib_acm service\r
+ and a test/configuration utility - ib_acme.  Both are userspace components\r
+diff --git a/configure.in b/configure.in
+index c83dfe8..7fc4761 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1,11 +1,11 @@
+ dnl Process this file with autoconf to produce a configure script.\r
+ \r
+ AC_PREREQ(2.57)\r
+-AC_INIT(ibacm, 1.0.3, linux-rdma@vger.kernel.org)\r
++AC_INIT(ibacm, 1.0.4, linux-rdma@vger.kernel.org)\r
+ AC_CONFIG_SRCDIR([src/acm.c])\r
+ AC_CONFIG_AUX_DIR(config)\r
+ AM_CONFIG_HEADER(config.h)\r
+-AM_INIT_AUTOMAKE(ibacm, 1.0.3)\r
++AM_INIT_AUTOMAKE(ibacm, 1.0.4)\r
+ \r
+ AM_PROG_LIBTOOL\r
+ \r
+diff --git a/ibacm.spec.in b/ibacm.spec.in
+index fa1f055..7a2ed9f 100644
+--- a/ibacm.spec.in
++++ b/ibacm.spec.in
+@@ -1,7 +1,7 @@
+ %define ver @VERSION@
+ 
+ Name: ibacm
+-Version: 1.0.3
++Version: 1.0.4
+ Release: 1%{?dist}
+ Summary: InfiniBand Communication Manager Assistant

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 24fc001..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,52 +0,0 @@
-Bottom: 7fffdf6024c787b6b6d1c93dd896c4818d9d1169
-Top:    62aef5e752df47c12b82cef53c2e68347b58174f
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-29 15:04:18 -0800
-
-Refresh of 1.0.4
-
----
-
-diff --git a/acm_notes.txt b/acm_notes.txt
-index 1eb6a62..4d20e71 100644
---- a/acm_notes.txt
-+++ b/acm_notes.txt
-@@ -23,7 +23,7 @@ implementation limits network traffic, SA interactions, and centralized
- services.  ACM supports multiple resolution protocols in order to handle\r
- different fabric topologies.\r
- \r
--This release 1.0.3 is limited in its handling of dynamic changes.\r
-+This release is limited in its handling of dynamic changes.\r
- \r
- The IB ACM package is comprised of two components: the ib_acm service\r
- and a test/configuration utility - ib_acme.  Both are userspace components\r
-diff --git a/configure.in b/configure.in
-index c83dfe8..7fc4761 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1,11 +1,11 @@
- dnl Process this file with autoconf to produce a configure script.\r
- \r
- AC_PREREQ(2.57)\r
--AC_INIT(ibacm, 1.0.3, linux-rdma@vger.kernel.org)\r
-+AC_INIT(ibacm, 1.0.4, linux-rdma@vger.kernel.org)\r
- AC_CONFIG_SRCDIR([src/acm.c])\r
- AC_CONFIG_AUX_DIR(config)\r
- AM_CONFIG_HEADER(config.h)\r
--AM_INIT_AUTOMAKE(ibacm, 1.0.3)\r
-+AM_INIT_AUTOMAKE(ibacm, 1.0.4)\r
- \r
- AM_PROG_LIBTOOL\r
- \r
-diff --git a/ibacm.spec.in b/ibacm.spec.in
-index fa1f055..7a2ed9f 100644
---- a/ibacm.spec.in
-+++ b/ibacm.spec.in
-@@ -1,7 +1,7 @@
- %define ver @VERSION@
- 
- Name: ibacm
--Version: 1.0.3
-+Version: 1.0.4
- Release: 1%{?dist}
- Summary: InfiniBand Communication Manager Assistant