refresh

diff --git a/meta b/meta
index 362a1ac6c1663551e8035af9212ef7aadf62ab02..79710b82f4f320453a74477ef8160859b2a67ae6 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: accd697af67abd2145b2285444ae604e61282db7
-Head: 9332c2146090e8bb76529ef9e3eceb5d47d23f3e
+Previous: 7e5dd771caaf06e0402bb7456d41b1205bbc6c33
+Head: b3d1911f70cd1b1dc39ff10e2a54fbf85f00370f
 Applied:
-  v1.0.3: 6ca6e1f18f1e24e12978906c49992e93d898ba5e
-  refresh-temp: 9332c2146090e8bb76529ef9e3eceb5d47d23f3e
+  v1.0.3: b3d1911f70cd1b1dc39ff10e2a54fbf85f00370f
 Unapplied:
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 9cc2c7d..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,52 +0,0 @@
-Bottom: 1a872937b30cacadadaea61c2b4755a657134ac8
-Top:    30326a5093b7b177c8d7612eba401d4999793f71
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-08-26 10:29:08 -0700
-
-Refresh of v1.0.3
-
----
-
-diff --git a/acm_notes.txt b/acm_notes.txt
-index a6becf7..1eb6a62 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.2 is limited in its handling of dynamic changes.\r
-+This release 1.0.3 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 dfddeac..c83dfe8 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.2, linux-rdma@vger.kernel.org)\r
-+AC_INIT(ibacm, 1.0.3, 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.2)\r
-+AM_INIT_AUTOMAKE(ibacm, 1.0.3)\r
- \r
- AM_PROG_LIBTOOL\r
- \r
-diff --git a/ibacm.spec.in b/ibacm.spec.in
-index bef7cba..fa1f055 100644
---- a/ibacm.spec.in
-+++ b/ibacm.spec.in
-@@ -1,7 +1,7 @@
- %define ver @VERSION@
- 
- Name: ibacm
--Version: 1.0.2
-+Version: 1.0.3
- Release: 1%{?dist}
- Summary: InfiniBand Communication Manager Assistant

diff --git a/patches/v1.0.3 b/patches/v1.0.3
index 5322d361acab477fc8b70a21c4953d9269f8b918..518d95eecca8dfe1b704a699500c1baa9b7fd94f 100644 (file)
--- a/patches/v1.0.3
+++ b/patches/v1.0.3
@@ -1,5 +1,5 @@
 Bottom: 1a872937b30cacadadaea61c2b4755a657134ac8
-Top:    1a872937b30cacadadaea61c2b4755a657134ac8
+Top:    30326a5093b7b177c8d7612eba401d4999793f71
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-08-26 10:27:49 -0700
 
@@ -10,4 +10,46 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/acm_notes.txt b/acm_notes.txt
+index a6becf7..1eb6a62 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.2 is limited in its handling of dynamic changes.\r
++This release 1.0.3 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 dfddeac..c83dfe8 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.2, linux-rdma@vger.kernel.org)\r
++AC_INIT(ibacm, 1.0.3, 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.2)\r
++AM_INIT_AUTOMAKE(ibacm, 1.0.3)\r
+ \r
+ AM_PROG_LIBTOOL\r
+ \r
+diff --git a/ibacm.spec.in b/ibacm.spec.in
+index bef7cba..fa1f055 100644
+--- a/ibacm.spec.in
++++ b/ibacm.spec.in
+@@ -1,7 +1,7 @@
+ %define ver @VERSION@
+ 
+ Name: ibacm
+-Version: 1.0.2
++Version: 1.0.3
+ Release: 1%{?dist}
+ Summary: InfiniBand Communication Manager Assistant