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/3acba18d Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/3acba18d Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/3acba18d Branch: refs/heads/griffin-0.2.0-incubating-spark1 Commit: 3acba18d2786af0e35599de6850b5f99bc0f01f8 Parents: d6a66a8 8171ab2 Author: Lionel Liu <[email protected]> Authored: Thu May 10 18:04:37 2018 +0800 Committer: Lionel Liu <[email protected]> Committed: Thu May 10 18:04:37 2018 +0800 ---------------------------------------------------------------------- griffin-doc/service/api-guide.md | 1 + .../org/apache/griffin/core/measure/MeasureOrgServiceImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
