Merge branch 'master' of https://github.com/apache/incubator-griffin
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/3133ec0a Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/3133ec0a Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/3133ec0a Branch: refs/heads/griffin-0.1.6-incubating-rc1 Commit: 3133ec0a4c8db207f0fc256a938ea489a3f03b40 Parents: 38f37b6 ac8351f Author: William Guo <[email protected]> Authored: Tue Sep 5 15:56:59 2017 +0800 Committer: William Guo <[email protected]> Committed: Tue Sep 5 15:56:59 2017 +0800 ---------------------------------------------------------------------- .../griffin/core/common/CacheEvictor.java | 2 +- .../core/measure/MeasureServiceImpl.java | 8 +-- .../metastore/hive/HiveMetastoreController.java | 17 +------ .../metastore/hive/HiveMetastoreService.java | 2 +- .../hive/HiveMetastoreServiceImpl.java | 3 +- .../metastore/kafka/KafkaSchemaController.java | 2 +- .../griffin/core/metric/MetricController.java | 6 +-- .../main/resources/application-dev.properties | 2 +- .../src/main/resources/application.properties | 2 +- service/src/main/resources/sparkJob.properties | 12 ++--- .../griffin/core/job/SparkSubmitJobTest.java | 12 ++--- .../core/measure/MeasureServiceImplTest.java | 52 ++++++++++---------- .../hive/HiveMetastoreControllerTest.java | 27 ++-------- .../hive/HiveMetastoreServiceImplTest.java | 4 +- .../kafka/KafkaSchemaServiceImplTest.java | 29 ++++------- .../core/metric/MetricControllerTest.java | 2 +- .../src/test/resources/application.properties | 4 +- ui/js/services/services.js | 2 +- 18 files changed, 69 insertions(+), 119 deletions(-) ----------------------------------------------------------------------
