From 68f2780d64fd5e11634cbae74d298a8baaf30a35 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Fri, 11 May 2012 10:49:21 -0700 Subject: [PATCH] pop --- meta | 6 +++--- patches/rstream-async-opt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta b/meta index a11b9a32..ec413508 100644 --- a/meta +++ b/meta @@ -1,12 +1,12 @@ Version: 1 -Previous: 894c1096feffdb35cd10b21c991dbf444c846d1b -Head: 8f0437ec677c4752126de8667e093667dd681d56 +Previous: 2a15a7209a620374d71e65167742963503645a00 +Head: 0ee1dfc9ad50f07fd3708ebb04cb92e0fb2f41d5 Applied: rs-locking: ec6a8efe211b0dc98548443c2e0d67e2c355351f reuseaddr: 5ce7d9c48d082fd1959918e9134f4bdd85c402d9 rstream-delay: 8f0437ec677c4752126de8667e093667dd681d56 + rstream-async-opt: 0ee1dfc9ad50f07fd3708ebb04cb92e0fb2f41d5 Unapplied: - rstream-async-opt: 05b2741e5c346be2ed80a63d3213487f2b2f808c comp_locks: b89aab130b4619806557e11e6b9c10964f00743f preload: 5dfe7abc07064485c5100e04e5412279244c2bc3 Hidden: diff --git a/patches/rstream-async-opt b/patches/rstream-async-opt index 7f44c784..6949ae6b 100644 --- a/patches/rstream-async-opt +++ b/patches/rstream-async-opt @@ -1,5 +1,5 @@ -Bottom: e158cfb023f019d4ef91f72e39f049c35cf5993e -Top: cf88942daee97c712f00f5b3c85efe180c90b3d3 +Bottom: 1e3526d39b2591bb10a08bfed2622f05f82b1bd8 +Top: fb3f150e6146757e6bdb884182c4b19457bd6b6b Author: Sean Hefty Date: 2012-05-11 10:41:02 -0700 @@ -11,7 +11,7 @@ Signed-off-by: Sean Hefty --- diff --git a/examples/rstream.c b/examples/rstream.c -index a52a262..b089c2a 100644 +index 7f39b29..decb204 100644 --- a/examples/rstream.c +++ b/examples/rstream.c @@ -561,7 +561,7 @@ int main(int argc, char **argv) -- 2.41.0