You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by he...@apache.org on 2022/05/09 15:20:27 UTC

[commons-jexl] 03/03: Merge remote-tracking branch 'origin/JEXL-367' into JEXL-367

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

henrib pushed a commit to branch JEXL-367
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git

commit 247bbdd4815bad2deffcf37089bf90c128dc1f20
Merge: 840b9d6c b7a89c98
Author: henrib <he...@apache.org>
AuthorDate: Mon May 9 17:19:41 2022 +0200

    Merge remote-tracking branch 'origin/JEXL-367' into JEXL-367
    
    # Conflicts:
    #       src/main/java/org/apache/commons/jexl3/JexlArithmetic.java
    #       src/main/java/org/apache/commons/jexl3/JexlFeatures.java
    #       src/main/java/org/apache/commons/jexl3/internal/Interpreter.java
    #       src/main/java/org/apache/commons/jexl3/parser/JexlParser.java
    #       src/main/java/org/apache/commons/jexl3/parser/Parser.jjt
    #       src/test/java/org/apache/commons/jexl3/jexl342/OptionalTest.java