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

Posted to commits@griffin.apache.org by gu...@apache.org on 2018/12/27 09:49:30 UTC

[griffin] 01/03: Merge branch 'master' of https://github.com/apache/griffin

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

guoyp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/griffin.git

commit 86f1d244a06d9b7161606c1e7ac571fb6cf0cf33
Merge: 81487af f2292ac
Author: William Guo <gu...@apache.org>
AuthorDate: Wed Dec 19 14:26:25 2018 +0800

    Merge branch 'master' of https://github.com/apache/griffin

 service/pom.xml                                    | 53 ++++++++++++++++------
 .../src/main/resources/application-dev.properties  | 40 ----------------
 .../main/resources/application-mysql.properties    | 27 +++++++++++
 service/src/main/resources/banner.txt              |  2 +-
 4 files changed, 68 insertions(+), 54 deletions(-)