From: sean.hefty@intel.com Date: Wed, 11 Jul 2012 19:40:54 +0000 (-0700) Subject: refresh X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=785f8a89ae74fa76aff42fdd4f45831301d0f139;p=~shefty%2Flibrdmacm.git refresh --- diff --git a/meta b/meta index 3ea37b65..a0a73d9d 100644 --- a/meta +++ b/meta @@ -1,12 +1,11 @@ Version: 1 -Previous: 3ba5b68bc26dc6fd7b3eb04ad71138a969f04b0d -Head: d07ba601ed284a2b7e47579d57beabf07cffb114 +Previous: ea8837f51d43adc21feb479565f45ffed9b05257 +Head: c9364da40d938c8b4bfb4821de5b9ede6deb413a Applied: build-preload: 934949885dc5db0c30a70378b7fc8c36d512e32f chk-src: 5c2bd1511d359e196016e30ee47624fde9c9d825 incl-com: 918baa159e716b4430be62a6927f5836a790ffe4 - refresh-temp: ba7cecb338389d3b45eb186cecc66b15e92a06e5 - refresh-temp-0: d07ba601ed284a2b7e47579d57beabf07cffb114 + refresh-temp: c9364da40d938c8b4bfb4821de5b9ede6deb413a Unapplied: v1.0.16: af1395a0bf48c85fea51422eaaa29aa1d27444cd waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8 diff --git a/patches/refresh-temp b/patches/refresh-temp index d2a431a1..40689201 100644 --- a/patches/refresh-temp +++ b/patches/refresh-temp @@ -1,5 +1,5 @@ Bottom: dfec70d648229122a223c74fd6c162bb7057df14 -Top: dfec70d648229122a223c74fd6c162bb7057df14 +Top: 1520c2d07424849e7f892c80248c4e19cec7a862 Author: sean.hefty@intel.com Date: 2012-07-11 12:39:24 -0700 @@ -7,4 +7,16 @@ Refresh of incl-com --- - +diff --git a/Makefile.am b/Makefile.am +index b271b45..058b042 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -123,7 +123,7 @@ man_MANS = \ + man/rdma_cm.7 \ + man/rsocket.7 + +-EXTRA_DIST = src/cma.h src/indexer.h src/librdmacm.map \ ++EXTRA_DIST = src/cma.h src/indexer.h src/librdmacm.map examples/common.h \ + librdmacm.spec.in $(man_MANS) + + dist-hook: librdmacm.spec diff --git a/patches/refresh-temp-0 b/patches/refresh-temp-0 deleted file mode 100644 index 7f4c04f0..00000000 --- a/patches/refresh-temp-0 +++ /dev/null @@ -1,22 +0,0 @@ -Bottom: dfec70d648229122a223c74fd6c162bb7057df14 -Top: 1520c2d07424849e7f892c80248c4e19cec7a862 -Author: sean.hefty@intel.com -Date: 2012-07-11 12:40:54 -0700 - -Refresh of refresh-temp - ---- - -diff --git a/Makefile.am b/Makefile.am -index b271b45..058b042 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -123,7 +123,7 @@ man_MANS = \ - man/rdma_cm.7 \ - man/rsocket.7 - --EXTRA_DIST = src/cma.h src/indexer.h src/librdmacm.map \ -+EXTRA_DIST = src/cma.h src/indexer.h src/librdmacm.map examples/common.h \ - librdmacm.spec.in $(man_MANS) - - dist-hook: librdmacm.spec