refresh

diff --git a/meta b/meta
index c89cf469732b47ec292e62e4ac415150cd1a3a54..f246e363c638ad84b897c8f6384378396ac03775 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 5641e6ecc8212b51c1d2fcdc702b0bfdc1b67a40
-Head: a4b75cc8ffe15aa1463e6e76cc218bd2fc6f8e9f
+Previous: c48686550089c23bde3518fd648d62cb210246d1
+Head: 3c7c899adc5a1cefd244be4f54b5be9b6cbc7d46
 Applied:
   dsocket: 320986faa492c17e8858885798b9da8afaad7551
-  udpong: 527e623ad239ec260273754dda722a5e3d806731
-  refresh-temp: a4b75cc8ffe15aa1463e6e76cc218bd2fc6f8e9f
+  udpong: 3c7c899adc5a1cefd244be4f54b5be9b6cbc7d46
 Unapplied:
   test-udp: f6c78ad2a26f452cf166aff1baa7b76160bd8bf7
   iom-dbg: 88434072d07f8edc58f454ac954d78bd39441eed

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 236aa6c..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: d5fe7aec8cca640b7e39056a864e0c1e0cc6dc7c
-Top:    854184ce75f3902fa1b4d84530045ee2fb8fbb05
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-12-07 17:25:10 -0800
-
-Refresh of udpong
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index ac3a6b6..3198165 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -29,7 +29,7 @@ src_librspreload_la_LIBADD = $(top_builddir)/src/librdmacm.la
- bin_PROGRAMS = examples/ucmatose examples/rping examples/udaddy examples/mckey \
-              examples/rdma_client examples/rdma_server examples/rdma_xclient \
-              examples/rdma_xserver examples/rstream examples/rcopy \
--             examples/riostream
-+             examples/riostream examples/udpong
- examples_ucmatose_SOURCES = examples/cmatose.c examples/common.c
- examples_ucmatose_LDADD = $(top_builddir)/src/librdmacm.la
- examples_rping_SOURCES = examples/rping.c

diff --git a/patches/udpong b/patches/udpong
index bb92d18de443f58c2f31b77c0c2c4949b4cb87d4..90a25a3e1541abb9d65d1fe23cbc5f5b56a97295 100644 (file)
--- a/patches/udpong
+++ b/patches/udpong
@@ -1,5 +1,5 @@
 Bottom: d58bea7ff66215f5a1631dca9de9254822217783
-Top:    d5fe7aec8cca640b7e39056a864e0c1e0cc6dc7c
+Top:    854184ce75f3902fa1b4d84530045ee2fb8fbb05
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-12-05 15:58:03 -0800
 
@@ -11,9 +11,18 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/Makefile.am b/Makefile.am
-index d72016d..ac3a6b6 100644
+index d72016d..3198165 100644
 --- a/Makefile.am
 +++ b/Makefile.am
+@@ -29,7 +29,7 @@ src_librspreload_la_LIBADD = $(top_builddir)/src/librdmacm.la
+ bin_PROGRAMS = examples/ucmatose examples/rping examples/udaddy examples/mckey \
+              examples/rdma_client examples/rdma_server examples/rdma_xclient \
+              examples/rdma_xserver examples/rstream examples/rcopy \
+-             examples/riostream
++             examples/riostream examples/udpong
+ examples_ucmatose_SOURCES = examples/cmatose.c examples/common.c
+ examples_ucmatose_LDADD = $(top_builddir)/src/librdmacm.la
+ examples_rping_SOURCES = examples/rping.c
 @@ -46,12 +46,14 @@ examples_rdma_xclient_SOURCES = examples/rdma_xclient.c
  examples_rdma_xclient_LDADD = $(top_builddir)/src/librdmacm.la
  examples_rdma_xserver_SOURCES = examples/rdma_xserver.c