refresh

diff --git a/meta b/meta
index f2ce7e52c2de42c646307ba8b7f57ece817605f7..c3efdaac052f529f753bbfad1160f8600772524b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 62b4f3900ffecf2226dfb3d6c94d640179dd463b
-Head: 5278f24eb3db4dafe96629e3f41b277e19652b36
+Previous: 26e192fd7a48c2fa45f4ca9855ef6374bf1f05ec
+Head: 7536a46ad1f69e6b7f41adb48bf8ddd2ee1a5129
 Applied:
   reuseaddr: 5ce7d9c48d082fd1959918e9134f4bdd85c402d9
   rs-nodelay: c7515656281368210d75c103cc68c131511debf6
@@ -8,8 +8,7 @@ Applied:
   rs-async-opt: d541438b83de7721c8ce91fd25c2801d99f5247a
   rs-async-nonblock: 8cea41290e9c701beaa780fd2f412060916ca269
   rs-group-tests: f484de0b80b9369ad12c6b5628bb49a51dfc4ef0
-  rs-fulltest: a91cd18a4f7c5b6b5f7483f78e6d3916f66ef46f
-  refresh-temp: 5278f24eb3db4dafe96629e3f41b277e19652b36
+  rs-fulltest: 7536a46ad1f69e6b7f41adb48bf8ddd2ee1a5129
 Unapplied:
   old-acm: 890853ba658370faaeb7621362228e90f036bb17
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index d1dd1b9..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,23 +0,0 @@
-Bottom: a069666dc428f246f9dc954bdb50553367794189
-Top:    7553b4a2424ee63be0ec596d9d62a0f8512d235c
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-18 15:34:05 -0700
-
-Refresh of rs-fulltest
-
----
-
-diff --git a/man/rstream.1 b/man/rstream.1
-index 58bd7e3..0909932 100644
---- a/man/rstream.1
-+++ b/man/rstream.1
-@@ -30,7 +30,8 @@ The number of messages to transfer from the client to the server and
- back again on each iteration.  (default 1)
- .TP
- \-S transfer_size
--The size of each send transfer, in bytes.  (default 1000)
-+The size of each send transfer, in bytes.  (default 1000)  If 'all'
-+is specified, rstream will run a series of tests of various sizes.
- .TP
- \-p server_port
- The server's port number.

diff --git a/patches/rs-fulltest b/patches/rs-fulltest
index 4b30969f350e03aee6ccc13389118ceed027befe..29a2b05f9c402f7e3d5dedeb5942d78e1b0b27aa 100644 (file)
--- a/patches/rs-fulltest
+++ b/patches/rs-fulltest
@@ -1,5 +1,5 @@
 Bottom: 73ebe2ff1ff06d4ecc24c5fe35c8f54b8ad98f9f
-Top:    a069666dc428f246f9dc954bdb50553367794189
+Top:    7553b4a2424ee63be0ec596d9d62a0f8512d235c
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-17 09:50:15 -0700
 
@@ -178,3 +178,17 @@ index ec9b4ff..104b318 100644
                        printf("\t[-p port_number]\n");
                        printf("\t[-T test_option]\n");
                        printf("\t    s|sockets - use standard tcp/ip sockets\n");
+diff --git a/man/rstream.1 b/man/rstream.1
+index 58bd7e3..0909932 100644
+--- a/man/rstream.1
++++ b/man/rstream.1
+@@ -30,7 +30,8 @@ The number of messages to transfer from the client to the server and
+ back again on each iteration.  (default 1)
+ .TP
+ \-S transfer_size
+-The size of each send transfer, in bytes.  (default 1000)
++The size of each send transfer, in bytes.  (default 1000)  If 'all'
++is specified, rstream will run a series of tests of various sizes.
+ .TP
+ \-p server_port
+ The server's port number.