refresh

diff --git a/meta b/meta
index 15b23772bd663fba27723b9e7c2806fbd6546857..2780d0a77a0aecc527e1550215f187c667f5d28a 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 77453423ef326692d2982bc485b50aebc0e692b2
-Head: 0b66d885131e63efc879e6df2c923bcea500da13
+Previous: e7b576dd4ed0e8894c818957443f9f437557bcad
+Head: 6efca9c423c697a6cb3367e38a517694162849fc
 Applied:
-  v1.1: b1cc7da03d7c5a33980c9b82b32a7b292cddca54
-  refresh-temp: 0b66d885131e63efc879e6df2c923bcea500da13
+  v1.1: 6efca9c423c697a6cb3367e38a517694162849fc
 Unapplied:
   suse: 7076e2a00570a3cda4e4ce034419399a23ebfb0a
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index de6771e..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,32 +0,0 @@
-Bottom: 4df8fa519baf0e24c5af25c6000d5277b1798cff
-Top:    4ac56e95accf205643b029a2becb9158b401452a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2015-07-29 11:36:27 -0700
-
-Refresh of v1.1
-
----
-
-diff --git a/configure.ac b/configure.ac
-index 3c86cfd..4d493bd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,7 +1,7 @@
- dnl Process this file with autoconf to produce a configure script.\r
- \r
- AC_PREREQ([2.63])\r
--AC_INIT([ibacm], [1.0.8], [linux-rdma@vger.kernel.org])\r
-+AC_INIT([ibacm], [1.1.0], [linux-rdma@vger.kernel.org])\r
- AC_CONFIG_SRCDIR([src/acm.c])\r
- AC_CONFIG_AUX_DIR(config)\r
- AC_CONFIG_HEADERS([config.h])\r
-diff --git a/ibacm.spec.in b/ibacm.spec.in
-index 6894461..0167e26 100644
---- a/ibacm.spec.in
-+++ b/ibacm.spec.in
-@@ -1,5 +1,5 @@
- Name: ibacm
--Version: 1.0.8
-+Version: 1.1.0
- Release: 1%{?dist}
- Summary: InfiniBand Communication Manager Assistant

diff --git a/patches/v1.1 b/patches/v1.1
index 47b4f3a60691e2a137738b4a86579d96216bef25..062d218cce86e545eb0cb4e7ac6d72c917f807c6 100644 (file)
--- a/patches/v1.1
+++ b/patches/v1.1
@@ -1,5 +1,5 @@
 Bottom: 4df8fa519baf0e24c5af25c6000d5277b1798cff
-Top:    4df8fa519baf0e24c5af25c6000d5277b1798cff
+Top:    4ac56e95accf205643b029a2becb9158b401452a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2015-07-29 11:34:50 -0700
 
@@ -10,4 +10,26 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/configure.ac b/configure.ac
+index 3c86cfd..4d493bd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,7 +1,7 @@
+ dnl Process this file with autoconf to produce a configure script.\r
+ \r
+ AC_PREREQ([2.63])\r
+-AC_INIT([ibacm], [1.0.8], [linux-rdma@vger.kernel.org])\r
++AC_INIT([ibacm], [1.1.0], [linux-rdma@vger.kernel.org])\r
+ AC_CONFIG_SRCDIR([src/acm.c])\r
+ AC_CONFIG_AUX_DIR(config)\r
+ AC_CONFIG_HEADERS([config.h])\r
+diff --git a/ibacm.spec.in b/ibacm.spec.in
+index 6894461..0167e26 100644
+--- a/ibacm.spec.in
++++ b/ibacm.spec.in
+@@ -1,5 +1,5 @@
+ Name: ibacm
+-Version: 1.0.8
++Version: 1.1.0
+ Release: 1%{?dist}
+ Summary: InfiniBand Communication Manager Assistant