pop

diff --git a/meta b/meta
index 2d55c7f2db16e4a555d908fbf462404031991c96..b3ac48c2ddcdaabb17cff8b4077335d2894249cd 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,13 @@
 Version: 1
-Previous: 1139659c2096ed49de94b21a81028aea6db99240
-Head: d2901f9410f4d3d57629189a4ff51571bb3b0cf3
+Previous: d7b9df3b6f333d8b23d364fc1e77182735f81450
+Head: 25005d0475638542ab125b42d439d853c185402a
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
   loop: 1e219f58eafc1fb4f035e67e90d88b5b69d44c16
   fix-text: 6d9535384c392e24b6820e6de50112b39883fe56
   dist-cfg: d2901f9410f4d3d57629189a4ff51571bb3b0cf3
+  lower_retries: 25005d0475638542ab125b42d439d853c185402a
 Unapplied:
-  lower_retries: d33305b5848518e4616dd26f2827c580fd5034f6
   1.0.4: db24cd6696165aaa0710030188e77be4d6b4cbfd
 Hidden:

diff --git a/patches/lower_retries b/patches/lower_retries
index 5dc1684a2440b2cc894d7d9b3b54a8d35c08d8bb..7f93752ea7abf108c3dd2dfa05e431295d169eea 100644 (file)
--- a/patches/lower_retries
+++ b/patches/lower_retries
@@ -1,5 +1,5 @@
-Bottom: 373094ca753531b7dc76712d64a4a7efec7212b5
-Top:    dbfdf6b9c93daaf62e352c35bb0183c3b5668f98
+Bottom: d2658a6f412d516de16f5c37dfc6e29e7a058622
+Top:    1ac64e1267b46288459f8b4a25aeb893b3d48cba
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-30 19:38:15 -0800
 
@@ -16,7 +16,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/acm_opts.cfg b/acm_opts.cfg
-index a9319f2..f1f079c 100644
+index 3feadeb..372cd7b 100644
 --- a/acm_opts.cfg
 +++ b/acm_opts.cfg
 @@ -67,7 +67,7 @@ timeout 2000
@@ -26,7 +26,7 @@ index a9319f2..f1f079c 100644
 -retries 15\r
 +retries 2\r
  \r
- # send_depth:\r
+ # resolve_depth:\r
  # Specifies the maximum number of outstanding requests that can be in\r
 diff --git a/src/acm.c b/src/acm.c
 index 099518e..3152392 100644