rename

diff --git a/meta b/meta
index 73a4d9c45649c0c646309e98ba208c0155c03b91..34eb9d8f82fadfc9537d6a53b261cdd3bf707b99 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,10 @@
 Version: 1
-Previous: 395b69105bd93455fc497dde71ca73991b723277
+Previous: 13d8ee842db3e83618aea6266bd628760400b4f6
 Head: 992a8c5abcb0199fd6214fd31b6695573ccb5bf5
 Applied:
   reuseaddr: 5ce7d9c48d082fd1959918e9134f4bdd85c402d9
   rs-delay: 8f0437ec677c4752126de8667e093667dd681d56
-  rstream-async-opt: 0ee1dfc9ad50f07fd3708ebb04cb92e0fb2f41d5
+  rs-async-opt: 0ee1dfc9ad50f07fd3708ebb04cb92e0fb2f41d5
   rs-nodelay: 7601a5adca71f10ad1cb63292c769b7b9a35dd08
   rs-async-nonblock: 992a8c5abcb0199fd6214fd31b6695573ccb5bf5
 Unapplied:

diff --git a/patches/rs-async-opt b/patches/rs-async-opt
new file mode 100644 (file)
index 0000000..6949ae6
--- /dev/null
+++ b/patches/rs-async-opt
@@ -0,0 +1,25 @@
+Bottom: 1e3526d39b2591bb10a08bfed2622f05f82b1bd8
+Top:    fb3f150e6146757e6bdb884182c4b19457bd6b6b
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-05-11 10:41:02 -0700
+
+rstream: Clarify use of async test option
+
+Signed-off-by: Sean Hefty <sean.hefty@intel.com>
+
+
+---
+
+diff --git a/examples/rstream.c b/examples/rstream.c
+index 7f39b29..decb204 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
deleted file mode 100644 (file)
index 6949ae6..0000000
--- a/patches/rstream-async-opt
+++ /dev/null
@@ -1,25 +0,0 @@
-Bottom: 1e3526d39b2591bb10a08bfed2622f05f82b1bd8
-Top:    fb3f150e6146757e6bdb884182c4b19457bd6b6b
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-11 10:41:02 -0700
-
-rstream: Clarify use of async test option
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/examples/rstream.c b/examples/rstream.c
-index 7f39b29..decb204 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");