refresh

diff --git a/meta b/meta
index 3c5ed303438c780cdd38c8b618e3ba57ed9be0f8..9f0717c1918b0a851cd9b8262af2d8acb6b5b984 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: b63bd2debf26fae3e55a9eb015b6cef33f31a08f
-Head: f54ba5f01d6aef8bbffc5d54b4b53637403a2e56
+Previous: ecdb113f968ed046d6aab8bdd1276fc303780e4c
+Head: 363e693c1e12b1478d782141103f639af1979b8d
 Applied:
   rs-locking: ec6a8efe211b0dc98548443c2e0d67e2c355351f
   reuseaddr: 5ce7d9c48d082fd1959918e9134f4bdd85c402d9
   rstream-delay: 2f3d92fdd0c79f4825060433fd489995c1c83b80
-  rstream-async-opt: 70e1daca5dc886c5e33aa4ba3f2daeee20d14ed6
-  refresh-temp: f54ba5f01d6aef8bbffc5d54b4b53637403a2e56
+  rstream-async-opt: 363e693c1e12b1478d782141103f639af1979b8d
 Unapplied:
   comp_locks: b89aab130b4619806557e11e6b9c10964f00743f
   preload: 5dfe7abc07064485c5100e04e5412279244c2bc3

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 2287b22..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 4824ade2aa44138cac7516403f6a7045fea3dbee
-Top:    6f06120e0a9c54c1159bf2ce7335b8994f8497f5
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-11 10:41:32 -0700
-
-Refresh of rstream-async-opt
-
----
-
-diff --git a/examples/rstream.c b/examples/rstream.c
-index a52a262..b089c2a 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -561,7 +561,7 @@ int main(int argc, char **argv)
-                       printf("\t[-p port_number]\n");
-                       printf("\t[-T test_option]\n");
-                       printf("\t    s|sockets - use standard tcp/ip sockets\n");
--                      printf("\t    a|async - asynchronous operation\n");
-+                      printf("\t    a|async - asynchronous operation (use poll)\n");
-                       printf("\t    b|blocking - use blocking calls\n");
-                       printf("\t    n|nonblocking - use nonblocking calls\n");
-                       printf("\t    v|verify - verify data\n");

diff --git a/patches/rstream-async-opt b/patches/rstream-async-opt
index cec7b697b1982d10fd6d6d3769e96db5d858a190..a739f4897d8ce92ed1b9ce24a36519c9655d4899 100644 (file)
--- a/patches/rstream-async-opt
+++ b/patches/rstream-async-opt
@@ -1,5 +1,5 @@
 Bottom: 4824ade2aa44138cac7516403f6a7045fea3dbee
-Top:    4824ade2aa44138cac7516403f6a7045fea3dbee
+Top:    6f06120e0a9c54c1159bf2ce7335b8994f8497f5
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-11 10:41:02 -0700
 
@@ -10,4 +10,16 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/examples/rstream.c b/examples/rstream.c
+index a52a262..b089c2a 100644
+--- a/examples/rstream.c
++++ b/examples/rstream.c
+@@ -561,7 +561,7 @@ int main(int argc, char **argv)
+                       printf("\t[-p port_number]\n");
+                       printf("\t[-T test_option]\n");
+                       printf("\t    s|sockets - use standard tcp/ip sockets\n");
+-                      printf("\t    a|async - asynchronous operation\n");
++                      printf("\t    a|async - asynchronous operation (use poll)\n");
+                       printf("\t    b|blocking - use blocking calls\n");
+                       printf("\t    n|nonblocking - use nonblocking calls\n");
+                       printf("\t    v|verify - verify data\n");