refresh

diff --git a/meta b/meta
index 9455d7eb0c45e10e9d050a3a47ab4c2afd6d65d5..62ef5f1653ba0332b33e2b8a7db0ea79e941d4dc 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 18dbe954bff75a0df27ca1a5e8f8c95f2579b2b6
-Head: 9d5477b2307047803cf4ce52b15f8b7035879c4a
+Previous: ad9fc11959010f7b18069970cfe4c0cf5d6cbcbf
+Head: c7515656281368210d75c103cc68c131511debf6
 Applied:
   reuseaddr: 5ce7d9c48d082fd1959918e9134f4bdd85c402d9
-  rs-nodelay: b0bd56d129bc21e6683e742da4eaac5b7709067c
-  refresh-temp: 9d5477b2307047803cf4ce52b15f8b7035879c4a
+  rs-nodelay: c7515656281368210d75c103cc68c131511debf6
 Unapplied:
   rs-delay: d7eefeeab4adb9234aa20d659546d9454ee32f86
   rs-async-opt: 7761e53b55e08d9424ae2f6cb6baecbe2a1db856

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index ce6cc9b..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,10 +0,0 @@
-Bottom: 8cf2ab30dd18c0af94f11796a7f62c7abdbec612
-Top:    8cf2ab30dd18c0af94f11796a7f62c7abdbec612
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-16 16:04:30 -0700
-
-Refresh of rs-nodelay
-
----
-
-

diff --git a/patches/rs-nodelay b/patches/rs-nodelay
index 84090eb67dda1efbde206d370d8e3f4875db1e1a..87bc377123f46a06c0df0e65cfc2a2e9d468e364 100644 (file)
--- a/patches/rs-nodelay
+++ b/patches/rs-nodelay
@@ -9,7 +9,7 @@ The NODELAY option is coupled with whether the socket is blocking
 or nonblocking.  Remove this coupling and always set the NODELAY
 option.
 
-NODELAY currently has no affect on rsockets.
+NODELAY currently has no effect on rsockets.
 
 Signed-off-by: Sean Hefty <sean.hefty@intel.com>