refresh

diff --git a/meta b/meta
index 88664cb1436023e1ce16c8e5c716108be368da1a..57b286ec79543e7a00abbf76a648bcaabbe3a59b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 7acdb9763e3baa678335ac38bb05fab4d75591cd
-Head: 41a9d1fdd93ec1dd92a07b7f1474a3fd45f3d2ab
+Previous: 1bb88ec3b5383ddb0c686514d3d9de2b7a627247
+Head: b60d0c8781b920fad52ac3fb63264ea538cf226a
 Applied:
   rs-locking: ec6a8efe211b0dc98548443c2e0d67e2c355351f
   reuseaddr: 5ce7d9c48d082fd1959918e9134f4bdd85c402d9
-  rstream-delay: 2f3d92fdd0c79f4825060433fd489995c1c83b80
-  refresh-temp: 41a9d1fdd93ec1dd92a07b7f1474a3fd45f3d2ab
+  rstream-delay: b60d0c8781b920fad52ac3fb63264ea538cf226a
 Unapplied:
   rstream-async-opt: 363e693c1e12b1478d782141103f639af1979b8d
   comp_locks: b89aab130b4619806557e11e6b9c10964f00743f

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index ea02ddc..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 4824ade2aa44138cac7516403f6a7045fea3dbee
-Top:    e158cfb023f019d4ef91f72e39f049c35cf5993e
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-11 10:42:31 -0700
-
-Refresh of rstream-delay
-
----
-
-diff --git a/man/rstream.1 b/man/rstream.1
-index 701db3a..58bd7e3 100644
---- a/man/rstream.1
-+++ b/man/rstream.1
-@@ -42,6 +42,8 @@ s | socket  - uses standard socket calls to transfer data
- .P
- a | async - uses asynchronous operation (e.g. select / poll)
- .P
-+b | blocking - uses blocking calls
-+.P
- n | nonblocking - uses non-blocking calls
- .P
- v | verify - verifies data transfers

diff --git a/patches/rstream-delay b/patches/rstream-delay
index 02d2a1ab6a477682f4ab901d945d9f7d5e93f5cb..3a4d2175f03a4d1c0a6c680ec47eddd9bcece9cd 100644 (file)
--- a/patches/rstream-delay
+++ b/patches/rstream-delay
@@ -1,5 +1,5 @@
 Bottom: ea75b8334003947a7f09ba5f0efcec267b5143c1
-Top:    4824ade2aa44138cac7516403f6a7045fea3dbee
+Top:    e158cfb023f019d4ef91f72e39f049c35cf5993e
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-11 10:33:13 -0700
 
@@ -78,3 +78,16 @@ index 8aa089d..a52a262 100644
                        printf("\t    n|nonblocking - use nonblocking calls\n");
                        printf("\t    v|verify - verify data\n");
                        exit(1);
+diff --git a/man/rstream.1 b/man/rstream.1
+index 701db3a..58bd7e3 100644
+--- a/man/rstream.1
++++ b/man/rstream.1
+@@ -42,6 +42,8 @@ s | socket  - uses standard socket calls to transfer data
+ .P
+ a | async - uses asynchronous operation (e.g. select / poll)
+ .P
++b | blocking - uses blocking calls
++.P
+ n | nonblocking - uses non-blocking calls
+ .P
+ v | verify - verifies data transfers