Merge branch 'master' of https://github.com/apache/incubator-griffin into apache-master
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/5c17d83c Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/5c17d83c Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/5c17d83c Branch: refs/heads/griffin-0.2.0-incubating-spark1 Commit: 5c17d83cc804dbcdb0887c32a7e9db576285ab1f Parents: cc81a99 6c969e8 Author: Lionel Liu <[email protected]> Authored: Tue Apr 24 14:42:46 2018 +0800 Committer: Lionel Liu <[email protected]> Committed: Tue Apr 24 14:42:46 2018 +0800 ---------------------------------------------------------------------- .../apache/griffin/measure/config/params/user/UserParam.scala | 4 ++-- .../apache/griffin/measure/data/connector/DataConnector.scala | 2 +- .../measure/data/connector/batch/HiveBatchDataConnector.scala | 2 +- .../measure/data/connector/batch/TextDirBatchDataConnector.scala | 2 +- .../apache/griffin/measure/data/source/DataSourceFactory.scala | 4 ++-- .../scala/org/apache/griffin/measure/process/ProcessType.scala | 4 ++-- .../org/apache/griffin/measure/process/engine/DqEngines.scala | 2 +- .../scala/org/apache/griffin/measure/rule/dsl/CollectType.scala | 4 ++-- .../main/scala/org/apache/griffin/measure/rule/dsl/DqType.scala | 4 ++-- .../main/scala/org/apache/griffin/measure/rule/dsl/DslType.scala | 4 ++-- .../scala/org/apache/griffin/measure/rule/dsl/PersistType.scala | 4 ++-- .../src/main/scala/org/apache/griffin/measure/util/MailUtil.java | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
