external modifications

Modifications by tools other than StGit (e.g. git).

diff --git a/meta b/meta
index ea42d86f915b55585156b789d7dbcbe7fcd38dee..89ad89dc10f27ca6f0eb42fc975b6ed8e7ec486f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,11 @@
 Version: 1
-Previous: cac0d61bd114dbf5b8b59a2481d9e3ed4245d070
-Head: 6620a7428bf5a3f9f55de7d7e297f7232f13d16e
+Previous: 0fed49159ac1a64d4a8d5350dac0a6454e6f524a
+Head: 0ababca374ff33606d2d3f391b43508691d3d38f
 Applied:
   build-preload: 934949885dc5db0c30a70378b7fc8c36d512e32f
   chk-src: 5c2bd1511d359e196016e30ee47624fde9c9d825
   incl-com: 918baa159e716b4430be62a6927f5836a790ffe4
-  refresh-temp-0: 6620a7428bf5a3f9f55de7d7e297f7232f13d16e
 Unapplied:
-  refresh-temp: c9364da40d938c8b4bfb4821de5b9ede6deb413a
   v1.0.16: 3afc5427eee1f2d0667c4cbba0fc460e7e64b1f6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 4068920..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: dfec70d648229122a223c74fd6c162bb7057df14
-Top:    1520c2d07424849e7f892c80248c4e19cec7a862
-Author: sean.hefty@intel.com <sean.hefty@intel.com>
-Date:   2012-07-11 12:39:24 -0700
-
-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 (file)
index e6507ce..0000000
--- a/patches/refresh-temp-0
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: dfec70d648229122a223c74fd6c162bb7057df14
-Top:    31af2c38b30cc7004b87c3d8c3adf4afc84f8df4
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-11 12:48:08 -0700
-
-Refresh of incl-com
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index b271b45..4a8b9bc 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -124,7 +124,7 @@ man_MANS = \
-       man/rsocket.7
- 
- EXTRA_DIST = src/cma.h src/indexer.h src/librdmacm.map \
--      librdmacm.spec.in $(man_MANS)
-+      examples/common.h librdmacm.spec.in $(man_MANS)
- 
- dist-hook: librdmacm.spec
-       cp librdmacm.spec $(distdir)