Merge branch 'master' of https://github.com/apache/incubator-griffin into apache...
authorLionel Liu <bhlx3lyx7@163.com>
Tue, 6 Mar 2018 07:19:22 +0000 (15:19 +0800)
committerLionel Liu <bhlx3lyx7@163.com>
Tue, 6 Mar 2018 07:19:22 +0000 (15:19 +0800)

Trivial merge