pop

diff --git a/meta b/meta
index 3f0db312260c39317073e4765ac2a96762a579c5..9e6ca5893f0aa8f87d0a0e3d0f4bd2822afad981 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 2d4085826958f14865b25a70321f82ea19cd634b
-Head: 6365cdc2841a09311d4036d7b5c4f1dc825f8784
+Previous: b57d856689265d9d0f38938d96a728a6626c8d97
+Head: 5772432e29345d076aba9aa1ef2ef00a2032a8bc
 Applied:
   rmcfg: 84d811fcdc9f212f243f82594d613b68aea367c4
   acm_notes-txt-change-dos-forma: d76f683c246786876219d6db213643600734d894
@@ -12,8 +12,8 @@ Applied:
   increase-buffer-space-for-inet: 0807e94be46f2bca89c4dc5704b1a23282eda989
   ib_acme-c-support-ipv6-address: 2c9a9b53e2146bda18c4ceb99701ce696e75d89c
   convert-linux-header-files-fro: 6365cdc2841a09311d4036d7b5c4f1dc825f8784
+  add-support-for-preloading-ipv: 5772432e29345d076aba9aa1ef2ef00a2032a8bc
 Unapplied:
-  add-support-for-preloading-ipv: f6a5adcf1a2d12782e09a2d765970060ac1edbdc
   add-option-to-allow-for-acm-ca: aa1db6535ce98f854cf1914cb80e5a7d40496e60
   notes-fmt: 988d784b42cdb9db05b1608a5cdb29c51215bd9e
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/add-support-for-preloading-ipv b/patches/add-support-for-preloading-ipv
index 3b40d2e21101735763594f89193326f8dbb7fdf1..d04e4d3a5f4a8972b4e994f89c76715142518d03 100644 (file)
--- a/patches/add-support-for-preloading-ipv
+++ b/patches/add-support-for-preloading-ipv
@@ -1,5 +1,5 @@
-Bottom: 748a708247219f3faae97912aea19d2a10559a20
-Top:    0ff022b3d25b623caed4f1ee1ff0065ca0a1fb49
+Bottom: 68d366f0935aac6775374c4bdda641f755ec181e
+Top:    5c0c9d58c6999e66c55140ef33ca2b1b253a99e2
 Author: Hal Rosenstock <hal@mellanox.com>
 Date:   2013-06-27 21:48:11 +0300
 
@@ -243,7 +243,7 @@ index a37ebaa..cb5b809 100644
  
  static FILE *acm_open_log(void)
 diff --git a/src/acme.c b/src/acme.c
-index 2b89a18..46d93c0 100644
+index 0f1c53a..5022e05 100644
 --- a/src/acme.c
 +++ b/src/acme.c
 @@ -260,6 +260,12 @@ static void gen_opts_temp(FILE *f)