Merge branch 'spark2-doc' into spark2-merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/009d4495 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/009d4495 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/009d4495 Branch: refs/heads/griffin-0.2.0-incubating-rc4 Commit: 009d4495ccf0a88f9803ae7b7a5bcb4ec8ea9bfa Parents: 186ffdb e922915 Author: Lionel Liu <[email protected]> Authored: Thu Apr 26 15:34:10 2018 +0800 Committer: Lionel Liu <[email protected]> Committed: Thu Apr 26 15:34:10 2018 +0800 ---------------------------------------------------------------------- griffin-doc/deploy/deploy-guide.md | 42 ++++++++----- griffin-doc/dev/dev-env-build.md | 10 +-- .../docker/compose/docker-compose-batch.yml | 45 ++++++++++++++ .../docker/compose/docker-compose-streaming.yml | 65 ++++++++++++++++++++ griffin-doc/docker/griffin-docker-guide.md | 14 ++--- .../docker/svc_msr/docker-compose-batch.yml | 45 -------------- .../docker/svc_msr/docker-compose-streaming.yml | 65 -------------------- griffin-doc/measure/dsl-guide.md | 26 ++++++-- griffin-doc/roadmap.md | 41 +++++------- .../service/hibernate_eclipselink_switch.md | 19 ++++++ griffin-doc/service/mysql_postgresql_switch.md | 19 ++++++ .../measure/rule/dsl/expr/SelectExpr.scala | 2 +- service/src/main/resources/sparkJob.properties | 2 +- 13 files changed, 226 insertions(+), 169 deletions(-) ----------------------------------------------------------------------
