You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@pulsar.apache.org by rx...@apache.org on 2020/10/27 10:00:07 UTC

[pulsar] 02/02: [Release 2.6.2] Resolve pr 7194 conflict

This is an automated email from the ASF dual-hosted git repository.

rxl pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/pulsar.git

commit e78434a04b5323e0381648ebe72427a2c395b6bd
Author: Yuya Ebihara <eb...@gmail.com>
AuthorDate: Sun Jun 14 10:14:19 2020 +0900

    [Release 2.6.2] Resolve pr 7194 conflict
    
    Signed-off-by: xiaolong.ran <rx...@apache.org>
---
 pulsar-sql/presto-distribution/LICENSE | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
index 256359a..f2537a9 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -269,6 +269,8 @@ The Apache Software License, Version 2.0
     - jetty-server-9.4.27.v20200227.jar
     - jetty-servlet-9.4.27.v20200227.jar
     - jetty-util-9.4.27.v20200227.jar
+  * Asynchronous Http Client
+    - async-http-client-1.9.40.jar
   * Apache BVal
     - bval-core-1.1.1.jar
     - bval-jsr-1.1.1.jar