From c1b7726124ae68266c63ef174ac34a1a60a72839 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Tue, 27 Aug 2013 11:38:41 -0700 Subject: [PATCH] refresh --- meta | 7 +++---- patches/a | 15 +++++++++++++-- patches/refresh-temp | 21 --------------------- 3 files changed, 16 insertions(+), 27 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index f7292e36..3f18853f 100644 --- a/meta +++ b/meta @@ -1,9 +1,8 @@ Version: 1 -Previous: 79daf13e317313a2f8624d5a1c56d4068bf09b5e -Head: 5e46117176597e1ef0ddd6845a409c31e742f8d1 +Previous: c64e3a221e196fb0729e071a1abc9ae0126580e1 +Head: a53376c3c7887c52cf5b311b0b96cfa405a49d31 Applied: - a: 1d4feb2bda2eb2cdb6dd80503154ce3a6f72e76b - refresh-temp: 5e46117176597e1ef0ddd6845a409c31e742f8d1 + a: a53376c3c7887c52cf5b311b0b96cfa405a49d31 Unapplied: shutdown: 470d7dd6682f761c2b93f997cf7ae355a2171d59 old-af-ib: d71ebf70cf74111cfd5f0982d9abe6ec68fb38e3 diff --git a/patches/a b/patches/a index e2495708..f566e212 100644 --- a/patches/a +++ b/patches/a @@ -1,5 +1,5 @@ Bottom: ffbbb287b1a2e4fbdbcedb90103f988acb8fcb42 -Top: ffbbb287b1a2e4fbdbcedb90103f988acb8fcb42 +Top: f8e50db6a6df431f252c42108acad59c82371cf7 Author: Yan Droneaud Date: 2013-08-27 11:37:54 -0700 @@ -11,4 +11,15 @@ Signed-off-by: Sean Hefty --- - +diff --git a/examples/.gitignore b/examples/.gitignore +index ed17494..ce9156d 100644 +--- a/examples/.gitignore ++++ b/examples/.gitignore +@@ -8,6 +8,7 @@ + /.libs + /.dirstamp + ++/cmtime + /mckey + /rcopy + /rdma_client diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 3c337a9b..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,21 +0,0 @@ -Bottom: ffbbb287b1a2e4fbdbcedb90103f988acb8fcb42 -Top: f8e50db6a6df431f252c42108acad59c82371cf7 -Author: Sean Hefty -Date: 2013-08-27 11:38:40 -0700 - -Refresh of a - ---- - -diff --git a/examples/.gitignore b/examples/.gitignore -index ed17494..ce9156d 100644 ---- a/examples/.gitignore -+++ b/examples/.gitignore -@@ -8,6 +8,7 @@ - /.libs - /.dirstamp - -+/cmtime - /mckey - /rcopy - /rdma_client -- 2.46.0