refresh

diff --git a/meta b/meta
index b20dd0a2f51e64638aee731d372bbeb340d36a9f..d5717bbd4a5f21ff8b91800c12346ec563cb6613 100644 (file)
--- a/meta
+++ b/meta
@@ -1,14 +1,13 @@
 Version: 1
-Previous: a078aa6ec8f7d8743baf141c91fc521b698a7271
-Head: 7cde49124f14ef6b32955eb1543ba89601c52d6c
+Previous: 5733d860c228248f9e80db199ff2aa6b8e2caa6b
+Head: c5d6ebe851029954ce5a3e64969039bb04c42542
 Applied:
   locking: 49fcc60d268ba85ee40dc4a4e7d3a4faac3abe9b
   verbose: ab647a30aa155e72a51f9e7e228d558b8db6ec2a
   dbg_1: 669d3ab25cff51dd8ecd7a36eb74d02bd40f945e
   no_addr: c399f0580c6ba387b6aca30c622c8d2739498846
   log_port: 1d7b8af5414b5560464b4696b2b933c763d2d679
-  nodelay: 6a30ff823218bf435a96d4e6d6e4697426be6d29
-  refresh-temp: 7cde49124f14ef6b32955eb1543ba89601c52d6c
+  nodelay: c5d6ebe851029954ce5a3e64969039bb04c42542
 Unapplied:
   acme_dest: 830e850836f3c42c1b896dd19262ec8408e3d606
   show_err: 95aa9b300b5be4820af85f11d4ac7609e7cf2f7b

diff --git a/patches/nodelay b/patches/nodelay
index f8329540cbf06b17db1a76cd70940e403f81a883..b296f3c8dfd022e2a535047a1ca8a8a85595e2b3 100644 (file)
--- a/patches/nodelay
+++ b/patches/nodelay
@@ -10,7 +10,7 @@ protocols should be suppressed, and that only locally cached
 data should be returned.
 
 This helps support rdma_getaddrinfo options RAI_NUMERICHOST
-and RAI_NOROUTE.  If data for a request is availble, it is
+and RAI_NOROUTE.  If data for a request is available, it is
 immediately returned.  Otherwise, the client request is
 failed, but the lookup is still initiated.  This avoids
 blocking a client for an extended period of time while

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 58e246e..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,10 +0,0 @@
-Bottom: 6f14211892536dea81822fd014bde92a772ab5d9
-Top:    6f14211892536dea81822fd014bde92a772ab5d9
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-08 12:40:49 -0800
-
-Refresh of nodelay
-
----
-
-