From: Michiro HIBARI <hibari@users.sourceforge.jp>
Date: Mon, 17 Oct 2011 11:06:14 +0000 (+0900)
Subject: resolv conflict
X-Git-Tag: v3.0.2~4
X-Git-Url: http://git.osdn.net/view?p=ultramonkey-l7%2Fultramonkey-l7-v3.git;a=commitdiff_plain;h=1191c5bbde92fe6c12dabb2cfb35a01ea0c2e265

resolv conflict
---

1191c5bbde92fe6c12dabb2cfb35a01ea0c2e265
diff --cc CHANGES
index 39979dd5,1ae3da73..859d7120
--- a/CHANGES
+++ b/CHANGES
@@@ -1,3 -1,5 +1,5 @@@
 -[Feb. 10 2011] 3.0.2-1 HIBARI Michiro
 -  - Change connect method. (connect -> async_connect)
++[Oct. 17 2011] 3.0.2-1 HIBARI Michiro
++  - Change transport method sync to async. (ex. connect -> async_connect)
  [Jan. 25 2011] 3.0.1-1 HIBARI Michiro
    - Fix L7directord RA.(Remove need less option "-b".)