pop

diff --git a/meta b/meta
index 42c7454c9560560f21ac7be3643dbfa7664c5ce4..785738e2c906ae49f9fbd075a43251151b687559 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: b93d07b64494cf1784f2a3dbc17e1f5a0bdad199
-Head: 4009e8d08cde895a2c84225a8d5a1f275b15ced9
+Previous: a9a33c4d09b2853d10b3b839a0a1c59d5031fcd8
+Head: 20e051b4c40928fcddac0d64375acf52bffe86f7
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -11,8 +11,8 @@ Applied:
   locking: 60eb7f20f1d4835c0004988322089722ea49338b
   verbose: 6f096f8ddb8a734073e9f0d98cfec82e5dc69097
   dbg_1: 4009e8d08cde895a2c84225a8d5a1f275b15ced9
+  no_addr: 20e051b4c40928fcddac0d64375acf52bffe86f7
 Unapplied:
-  no_addr: e8252469c40c67bf4ba497b751dd4de394c222ad
   log_port: 3552e1cdc8aa9274dff4c314d8cbcfc5ac2e1086
   nodelay: 89973fbe5f8912da1987de5038402b3f7fd209a6
   acme_dest: 1428730a12a1b3a8f99d58c0658efe1f59179ce1

diff --git a/patches/no_addr b/patches/no_addr
index 2b948143692d986108ceb9f422b41e2844749688..075094c8deb979f8526dfb7afd870c7e36d3a9af 100644 (file)
--- a/patches/no_addr
+++ b/patches/no_addr
@@ -1,5 +1,5 @@
-Bottom: 5564da342fb659b4680860c3a9759efd77db7596
-Top:    6b06ea561b2b860919b8f7f649491264780cedf6
+Bottom: a7b9c3950b48c6667df1704ea92d5cd6c090f3f1
+Top:    2c5bd0cd061ee0b4c29db44daf0155b53b3b7962
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-06 11:06:47 -0800
 
@@ -17,7 +17,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index de54832..fbae482 100644
+index 40f2205..e035741 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -203,6 +203,7 @@ static SOCKET listen_socket;