refresh

diff --git a/meta b/meta
index 89a4b07c521bc01791094d0e1b2304af1d82dd0b..2034bf43f9e40588923bb9d89a24a1f500acc2d6 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 6f503b39bc7ecc09dba3035e6e8200ebf9fed17b
-Head: 1e1686bf1447d0d5fe11c29cabd94c38bd5c1ff7
+Previous: 961be909264e03c7770904dbb67c9cb0518c05ef
+Head: 4c91eafde3cd8143b4c28493a672a420c112fc62
 Applied:
   cma-rm-pd: 2ffda7f2991395570b9e776ff5ae256ca9684771
   transpose: 3e52eb22f44eafaefa95c4674bc5665a94e15694
@@ -8,8 +8,7 @@ Applied:
   rstream-fork: a1d261650896286989c5197199da7729b3d61fa5
   init-getname: 7d988863b218d1b66e3739ec4b6f51acc72b2334
   rs-ftp: 28e0744eb89227fbeded485fbad64010b9edf0f6
-  mpi-finalize: ae46429bed49504d5f3f89bb2e9b9840acca819b
-  refresh-temp: 1e1686bf1447d0d5fe11c29cabd94c38bd5c1ff7
+  mpi-finalize: 4c91eafde3cd8143b4c28493a672a420c112fc62
 Unapplied:
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/mpi-finalize b/patches/mpi-finalize
index 16f6f1786035e4d4fc3882d66472cac201296db6..c0107ecc3e926f17e4d0d1ec1f98575821eabff3 100644 (file)
--- a/patches/mpi-finalize
+++ b/patches/mpi-finalize
@@ -1,5 +1,5 @@
 Bottom: 2d7d36989522b9e010497256793038fb2cb5aa9e
-Top:    ca9c46877a96db574c5387990a9f437b760e32f3
+Top:    9cdfa8fc338b5927493ad5770aa1d2d9bd7f4cc6
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-26 15:35:32 -0700
 
@@ -12,18 +12,6 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-diff --git a/src/preload.c b/src/preload.c
-index 52eaf1a..026ff1c 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -801,6 +801,7 @@ int select(int nfds, fd_set *readfds, fd_set *writefds,
- int shutdown(int socket, int how)
- {
-       int fd;
-+      fflush(stdout);
-       return (fd_get(socket, &fd) == fd_rsocket) ?
-               rshutdown(fd, how) : real.shutdown(fd, how);
- }
 diff --git a/src/rsocket.c b/src/rsocket.c
 index ed125b3..d374af7 100644
 --- a/src/rsocket.c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 98036aa..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: ca9c46877a96db574c5387990a9f437b760e32f3
-Top:    9cdfa8fc338b5927493ad5770aa1d2d9bd7f4cc6
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-26 16:18:08 -0700
-
-Refresh of mpi-finalize
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 026ff1c..52eaf1a 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -801,7 +801,6 @@ int select(int nfds, fd_set *readfds, fd_set *writefds,
- int shutdown(int socket, int how)
- {
-       int fd;
--      fflush(stdout);
-       return (fd_get(socket, &fd) == fd_rsocket) ?
-               rshutdown(fd, how) : real.shutdown(fd, how);
- }