[phoenix] branch 4.x-HBase-1.4 updated (e431ff6 -> aca6c5a)

[ch...@apache.org]

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

chenglei pushed a change to branch 4.x-HBase-1.4
in repository https://gitbox.apache.org/repos/asf/phoenix.git.


 discard e431ff6  PHOENIX-5292 fix MathTrigFunctionTest file compile error(Xinyi Yan)
     new aca6c5a  PHOENIX-5292 fix MathTrigFunctionTest file compile error for branch 4.x-HBase-1.3/1.4/1.5

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (e431ff6)
            \
             N -- N -- N   refs/heads/4.x-HBase-1.4 (aca6c5a)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:

[phoenix] 01/01: PHOENIX-5292 fix MathTrigFunctionTest file compile error for branch 4.x-HBase-1.3/1.4/1.5

[ch...@apache.org]

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

chenglei pushed a commit to branch 4.x-HBase-1.4
in repository https://gitbox.apache.org/repos/asf/phoenix.git

commit aca6c5a2a0f9678797bc7a706e4d71bb23b66498
Author: chenglei <ch...@apache.org>
AuthorDate: Thu May 30 10:29:10 2019 +0800

    PHOENIX-5292 fix MathTrigFunctionTest file compile error for branch
    4.x-HBase-1.3/1.4/1.5
---
 .../apache/phoenix/expression/{function => }/MathTrigFunctionTest.java    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/phoenix-core/src/test/java/org/apache/phoenix/expression/function/MathTrigFunctionTest.java b/phoenix-core/src/test/java/org/apache/phoenix/expression/MathTrigFunctionTest.java
similarity index 100%
rename from phoenix-core/src/test/java/org/apache/phoenix/expression/function/MathTrigFunctionTest.java
rename to phoenix-core/src/test/java/org/apache/phoenix/expression/MathTrigFunctionTest.java