refresh

diff --git a/meta b/meta
index 331fe763a985bec34c442403dadfc8363ca47932..66762295c95914bef4a79e55b098a3be7c698d51 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: a8b32ec075c07cd4734e017103d40bf81e0bae2e
-Head: e43acdff9c5d09ba43bca8dadd186c69f6cfec40
+Previous: 4718ae6bd521d6f5cda1db2afd0ca65d478466e6
+Head: 0a83fa0154a0d56f255abe95cc31f54661b2c6eb
 Applied:
   daemon: 32ca7dbd7bb04dabb504faa3ffe319e5f965d716
   cfg: 91fd5f444591ae8691a5bcf155467d0e7c493963
   log: 1b4a23934cccf05a770fec86f6422788a5a52ee9
-  rel-1.0.2: cc347d6a84b8d7e90d473e05772cf626a87e6765
-  refresh-temp: e43acdff9c5d09ba43bca8dadd186c69f6cfec40
+  rel-1.0.2: 0a83fa0154a0d56f255abe95cc31f54661b2c6eb
 Unapplied:
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index ebb4013..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,52 +0,0 @@
-Bottom: a6f613d73c16c90079e3b7f2778739cf6811510a
-Top:    44cd90e52fd7bd946e34e9acdfcf1cef88293c9a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-08-10 14:01:02 -0700
-
-Refresh of rel-1.0.2
-
----
-
-diff --git a/acm_notes.txt b/acm_notes.txt
-index 2bd7afb..a6becf7 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.1 is limited in its handling of dynamic changes.\r
-+This release 1.0.2 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 71b3eb5..997c775 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.1, linux-rdma@vger.kernel.org)\r
-+AC_INIT(ibacm, 1.0.2, 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.1)\r
-+AM_INIT_AUTOMAKE(ibacm, 1.0.2)\r
- \r
- AM_PROG_LIBTOOL\r
- \r
-diff --git a/ibacm.spec.in b/ibacm.spec.in
-index bdd63d6..bef7cba 100644
---- a/ibacm.spec.in
-+++ b/ibacm.spec.in
-@@ -1,7 +1,7 @@
- %define ver @VERSION@
- 
- Name: ibacm
--Version: 1.0.1
-+Version: 1.0.2
- Release: 1%{?dist}
- Summary: InfiniBand Communication Manager Assistant

diff --git a/patches/rel-1.0.2 b/patches/rel-1.0.2
index a378c46c8a4a7b17be2468d4c1f3aeed9aebb745..2dc90e5ca0758b2ad02bd43208f36f52c885b225 100644 (file)
--- a/patches/rel-1.0.2
+++ b/patches/rel-1.0.2
@@ -1,5 +1,5 @@
 Bottom: a6f613d73c16c90079e3b7f2778739cf6811510a
-Top:    a6f613d73c16c90079e3b7f2778739cf6811510a
+Top:    44cd90e52fd7bd946e34e9acdfcf1cef88293c9a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-08-10 13:59:38 -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 2bd7afb..a6becf7 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.1 is limited in its handling of dynamic changes.\r
++This release 1.0.2 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 71b3eb5..997c775 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.1, linux-rdma@vger.kernel.org)\r
++AC_INIT(ibacm, 1.0.2, 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.1)\r
++AM_INIT_AUTOMAKE(ibacm, 1.0.2)\r
+ \r
+ AM_PROG_LIBTOOL\r
+ \r
+diff --git a/ibacm.spec.in b/ibacm.spec.in
+index bdd63d6..bef7cba 100644
+--- a/ibacm.spec.in
++++ b/ibacm.spec.in
+@@ -1,7 +1,7 @@
+ %define ver @VERSION@
+ 
+ Name: ibacm
+-Version: 1.0.1
++Version: 1.0.2
+ Release: 1%{?dist}
+ Summary: InfiniBand Communication Manager Assistant