refresh

diff --git a/meta b/meta
index d5b0863c9300c07fdf5cef1521ec103123dcf64a..2d55c7f2db16e4a555d908fbf462404031991c96 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: 3ce5946d722eaacb811aa50315445a4316d1547d
-Head: bea613bda214209c76ca761b4f12ed13bf450cc8
+Previous: 1139659c2096ed49de94b21a81028aea6db99240
+Head: d2901f9410f4d3d57629189a4ff51571bb3b0cf3
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
   loop: 1e219f58eafc1fb4f035e67e90d88b5b69d44c16
   fix-text: 6d9535384c392e24b6820e6de50112b39883fe56
-  dist-cfg: 20637b82a33287e1608205a614de11acd09b2746
-  refresh-temp: bea613bda214209c76ca761b4f12ed13bf450cc8
+  dist-cfg: d2901f9410f4d3d57629189a4ff51571bb3b0cf3
 Unapplied:
   lower_retries: d33305b5848518e4616dd26f2827c580fd5034f6
   1.0.4: db24cd6696165aaa0710030188e77be4d6b4cbfd

diff --git a/patches/dist-cfg b/patches/dist-cfg
index fe20a223dd9667a3b986a74268da502de12fed0e..6a51817eacba7de23da2d38776fc59b9399b2c73 100644 (file)
--- a/patches/dist-cfg
+++ b/patches/dist-cfg
@@ -1,5 +1,5 @@
 Bottom: 2ade29ce3f23fc9eb785f9810ca0b437d7a23a8c
-Top:    a0ecb1b922c5017e5c328ccc5c56928a340a4c65
+Top:    d2658a6f412d516de16f5c37dfc6e29e7a058622
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-30 19:31:04 -0800
 
@@ -28,16 +28,13 @@ index f443091..957b016 100644
  dist-hook: ibacm.spec
        cp ibacm.spec $(distdir)
 diff --git a/acm_opts.cfg b/acm_opts.cfg
-index a9319f2..372cd7b 100644
+index a9319f2..3feadeb 100644
 --- a/acm_opts.cfg
 +++ b/acm_opts.cfg
-@@ -67,7 +67,28 @@ timeout 2000
- # Number of times that the ACM service will retry a request.  This affects\r
- # both ACM multicast messages and and IB SA messages.\r
+@@ -69,6 +69,27 @@ timeout 2000
+ \r
+ retries 15\r
  \r
--retries 15\r
-+retries 2\r
-+\r
 +# resolve_depth:\r
 +# Specifies the maximum number of outstanding requests that can be in\r
 +# progress simultaneously.  A larger resolve depth allows for greater\r
@@ -58,9 +55,10 @@ index a9319f2..372cd7b 100644
 +# is separate from the specified resolve_depth.\r
 +\r
 +sa_depth 1\r
- \r
++\r
  # send_depth:\r
  # Specifies the maximum number of outstanding requests that can be in\r
+ # progress simultaneously.  A larger send depth allows for greater\r
 @@ -77,7 +98,7 @@ retries 15
  # the additional requests will automatically be queued until some of\r
  # the previous requests complete.\r

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index b91828f..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: a0ecb1b922c5017e5c328ccc5c56928a340a4c65
-Top:    d2658a6f412d516de16f5c37dfc6e29e7a058622
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-01 14:57:10 -0800
-
-Refresh of dist-cfg
-
----
-
-diff --git a/acm_opts.cfg b/acm_opts.cfg
-index 372cd7b..3feadeb 100644
---- a/acm_opts.cfg
-+++ b/acm_opts.cfg
-@@ -67,7 +67,7 @@ timeout 2000
- # Number of times that the ACM service will retry a request.  This affects\r
- # both ACM multicast messages and and IB SA messages.\r
- \r
--retries 2\r
-+retries 15\r
- \r
- # resolve_depth:\r
- # Specifies the maximum number of outstanding requests that can be in