You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@griffin.apache.org by gu...@apache.org on 2017/07/10 00:54:35 UTC
[1/6] incubator-griffin git commit: Merge branch 'master' of
https://github.com/apache/incubator-griffin
Repository: incubator-griffin
Updated Branches:
refs/heads/griffin-0.1.5-incubating-rc3 [created] 5107e5058
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/3c640c26
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/3c640c26
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/3c640c26
Branch: refs/heads/griffin-0.1.5-incubating-rc3
Commit: 3c640c262c9272526a0d868d17002900dab08bf3
Parents: 65ddd97 87f7101
Author: William Guo <gu...@icloud.com>
Authored: Fri Jul 7 07:31:23 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Fri Jul 7 07:31:23 2017 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/6] incubator-griffin git commit: Merge branch 'master' of
https://github.com/apache/incubator-griffin
Posted by gu...@apache.org.
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/2599d648
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/2599d648
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/2599d648
Branch: refs/heads/griffin-0.1.5-incubating-rc3
Commit: 2599d648665f54fa354c139c3cbf3668aa87ed2e
Parents: 3393612 9d8dfb0
Author: William Guo <gu...@icloud.com>
Authored: Fri Jul 7 14:42:21 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Fri Jul 7 14:42:21 2017 +0800
----------------------------------------------------------------------
CONTRIBUTING.md | 31 +++++++++---------
README.md | 30 +++++++++---------
griffin-doc/FSD.md | 30 +++++++++---------
griffin-doc/Testcase.md | 26 ++++++++-------
griffin-doc/dockerUIguide.md | 30 +++++++++---------
griffin-doc/intro.md | 30 +++++++++---------
griffin-doc/measures.md | 30 +++++++++---------
griffin-doc/proposal.md | 30 +++++++++---------
griffin-doc/roadmap.md | 30 +++++++++---------
griffin-doc/tdd.md | 30 +++++++++---------
griffin-doc/userguide.md | 30 +++++++++---------
measure/pom.xml | 28 ++++++++++-------
measure/src/main/resources/log4j.properties | 21 +++++++------
.../griffin/measure/batch/Application.scala | 32 ++++++++++---------
.../measure/batch/algo/AccuracyAlgo.scala | 28 ++++++++++-------
.../griffin/measure/batch/algo/Algo.scala | 32 ++++++++++---------
.../measure/batch/algo/BatchAccuracyAlgo.scala | 32 ++++++++++---------
.../measure/batch/algo/BatchProfileAlgo.scala | 32 ++++++++++---------
.../measure/batch/algo/MeasureType.scala | 28 ++++++++++-------
.../measure/batch/algo/ProfileAlgo.scala | 28 ++++++++++-------
.../measure/batch/algo/core/AccuracyCore.scala | 32 ++++++++++---------
.../measure/batch/algo/core/ProfileCore.scala | 32 ++++++++++---------
.../measure/batch/config/params/AllParam.scala | 28 ++++++++++-------
.../measure/batch/config/params/Param.scala | 28 ++++++++++-------
.../batch/config/params/env/CleanerParam.scala | 28 ++++++++++-------
.../batch/config/params/env/EnvParam.scala | 28 ++++++++++-------
.../batch/config/params/env/PersistParam.scala | 28 ++++++++++-------
.../batch/config/params/env/SparkParam.scala | 28 ++++++++++-------
.../config/params/user/DataConnectorParam.scala | 28 ++++++++++-------
.../config/params/user/EvaluateRuleParam.scala | 28 ++++++++++-------
.../batch/config/params/user/UserParam.scala | 28 ++++++++++-------
.../batch/config/reader/ParamFileReader.scala | 32 ++++++++++---------
.../config/reader/ParamHdfsFileReader.scala | 32 ++++++++++---------
.../config/reader/ParamRawStringReader.scala | 32 ++++++++++---------
.../batch/config/reader/ParamReader.scala | 32 ++++++++++---------
.../config/reader/ParamReaderFactory.scala | 32 ++++++++++---------
.../config/validator/AllParamValidator.scala | 32 ++++++++++---------
.../batch/config/validator/ParamValidator.scala | 32 ++++++++++---------
.../batch/connector/AvroDataConnector.scala | 32 ++++++++++---------
.../measure/batch/connector/DataConnector.scala | 32 ++++++++++---------
.../batch/connector/DataConnectorFactory.scala | 32 ++++++++++---------
.../batch/connector/HiveDataConnector.scala | 32 ++++++++++---------
.../griffin/measure/batch/log/Loggable.scala | 32 ++++++++++---------
.../measure/batch/persist/HdfsPersist.scala | 32 ++++++++++---------
.../measure/batch/persist/HttpPersist.scala | 32 ++++++++++---------
.../measure/batch/persist/LoggerPersist.scala | 28 ++++++++++-------
.../measure/batch/persist/MultiPersists.scala | 32 ++++++++++---------
.../griffin/measure/batch/persist/Persist.scala | 32 ++++++++++---------
.../measure/batch/persist/PersistFactory.scala | 32 ++++++++++---------
.../measure/batch/result/AccuracyResult.scala | 32 ++++++++++---------
.../measure/batch/result/ProfileResult.scala | 32 ++++++++++---------
.../griffin/measure/batch/result/Result.scala | 32 ++++++++++---------
.../measure/batch/result/ResultInfo.scala | 32 ++++++++++---------
.../measure/batch/rule/CalculationUtil.scala | 32 ++++++++++---------
.../measure/batch/rule/ExprValueUtil.scala | 28 ++++++++++-------
.../measure/batch/rule/RuleAnalyzer.scala | 28 ++++++++++-------
.../measure/batch/rule/RuleFactory.scala | 32 ++++++++++---------
.../griffin/measure/batch/rule/RuleParser.scala | 32 ++++++++++---------
.../batch/rule/expr/AnalyzableExpr.scala | 28 ++++++++++-------
.../measure/batch/rule/expr/Cacheable.scala | 28 ++++++++++-------
.../measure/batch/rule/expr/Calculatable.scala | 28 ++++++++++-------
.../batch/rule/expr/DataSourceable.scala | 28 ++++++++++-------
.../measure/batch/rule/expr/Describable.scala | 28 ++++++++++-------
.../griffin/measure/batch/rule/expr/Expr.scala | 32 ++++++++++---------
.../measure/batch/rule/expr/ExprDescOnly.scala | 32 ++++++++++---------
.../measure/batch/rule/expr/ExprIdCounter.scala | 32 ++++++++++---------
.../measure/batch/rule/expr/FieldDescOnly.scala | 32 ++++++++++---------
.../measure/batch/rule/expr/LiteralExpr.scala | 28 ++++++++++-------
.../measure/batch/rule/expr/LogicalExpr.scala | 28 ++++++++++-------
.../measure/batch/rule/expr/MathExpr.scala | 28 ++++++++++-------
.../measure/batch/rule/expr/SelectExpr.scala | 28 ++++++++++-------
.../measure/batch/rule/expr/StatementExpr.scala | 28 ++++++++++-------
.../griffin/measure/batch/utils/HdfsUtil.scala | 32 ++++++++++---------
.../griffin/measure/batch/utils/HttpUtil.scala | 32 ++++++++++---------
.../griffin/measure/batch/utils/JsonUtil.scala | 32 ++++++++++---------
measure/src/test/resources/log4j.properties | 21 +++++++------
.../batch/algo/BatchAccuracyAlgoTest.scala | 32 ++++++++++---------
.../batch/algo/BatchProfileAlgoTest.scala | 32 ++++++++++---------
.../batch/algo/core/AccuracyCoreTest.scala | 28 ++++++++++-------
.../batch/algo/core/ProfileCoreTest.scala | 28 ++++++++++-------
.../reader/ParamRawStringReaderTest.scala | 32 ++++++++++---------
.../validator/AllParamValidatorTest.scala | 32 ++++++++++---------
.../measure/batch/persist/HdfsPersistTest.scala | 32 ++++++++++---------
.../measure/batch/persist/HttpPersistTest.scala | 32 ++++++++++---------
.../batch/result/AccuracyResultTest.scala | 32 ++++++++++---------
.../batch/result/ProfileResultTest.scala | 32 ++++++++++---------
.../measure/batch/rule/RuleAnalyzerTest.scala | 28 ++++++++++-------
.../measure/batch/rule/RuleFactoryTest.scala | 32 ++++++++++---------
.../measure/batch/rule/RuleParserTest.scala | 32 ++++++++++---------
.../measure/batch/utils/JsonUtilTest.scala | 32 ++++++++++---------
merge_pr.py | 30 +++++++++---------
pom.xml | 28 ++++++++++-------
service/pom.xml | 28 ++++++++++-------
.../griffin/core/GriffinWebApplication.java | 29 +++++++++--------
.../griffin/core/common/SimpleCORSFilter.java | 32 ++++++++++---------
.../griffin/core/measure/AuditableEntity.java | 32 ++++++++++---------
.../griffin/core/measure/DataConnector.java | 32 ++++++++++---------
.../griffin/core/measure/EvaluateRule.java | 32 ++++++++++---------
.../apache/griffin/core/measure/Measure.java | 32 ++++++++++---------
.../griffin/core/measure/MeasureController.java | 28 ++++++++++-------
.../griffin/core/measure/MeasureService.java | 32 ++++++++++---------
.../core/measure/MeasureServiceImpl.java | 32 ++++++++++---------
.../core/measure/repo/DataConnectorRepo.java | 32 ++++++++++---------
.../core/measure/repo/EvaluateRuleRepo.java | 32 ++++++++++---------
.../griffin/core/measure/repo/MeasureRepo.java | 32 ++++++++++---------
.../core/metastore/HiveMetastoreController.java | 33 +++++++++++---------
.../core/metastore/HiveMetastoreProxy.java | 28 ++++++++++-------
.../core/metastore/HiveMetastoreService.java | 32 ++++++++++---------
.../metastore/HiveMetastoreServiceImpl.java | 32 ++++++++++---------
.../core/metastore/KafkaSchemaController.java | 28 ++++++++++-------
.../core/metastore/KafkaSchemaService.java | 32 ++++++++++---------
.../core/metastore/KafkaSchemaServiceImpl.java | 32 ++++++++++---------
.../griffin/core/metric/MetricController.java | 32 ++++++++++---------
.../griffin/core/metric/MetricService.java | 28 ++++++++++-------
.../griffin/core/metric/MetricServiceImpl.java | 28 ++++++++++-------
.../AutowiringSpringBeanJobFactory.java | 32 ++++++++++---------
.../org/apache/griffin/core/schedule/Conf.java | 28 ++++++++++-------
.../apache/griffin/core/schedule/JobHealth.java | 31 ++++++++++--------
.../core/schedule/Repo/ScheduleStateRepo.java | 27 +++++++++-------
.../griffin/core/schedule/ScheduleResult.java | 32 ++++++++++---------
.../griffin/core/schedule/ScheduleState.java | 33 +++++++++++---------
.../griffin/core/schedule/SchedulerConfig.java | 32 ++++++++++---------
.../core/schedule/SchedulerController.java | 28 ++++++++++-------
.../core/schedule/SchedulerRequestBody.java | 33 +++++++++++---------
.../griffin/core/schedule/SchedulerService.java | 32 ++++++++++---------
.../core/schedule/SchedulerServiceImpl.java | 32 ++++++++++---------
.../griffin/core/schedule/SparkJobDO.java | 32 ++++++++++---------
.../griffin/core/schedule/SparkSubmitJob.java | 28 ++++++++++-------
.../griffin/core/service/GriffinController.java | 32 ++++++++++---------
.../org/apache/griffin/core/util/AvroUtil.java | 32 ++++++++++---------
.../core/util/GriffinOperationMessage.java | 32 ++++++++++---------
service/src/main/resources/Init_quartz.sql | 30 +++++++++---------
.../main/resources/application-dev.properties | 23 +++++++-------
.../main/resources/application-prod.properties | 21 +++++++------
.../src/main/resources/application.properties | 21 +++++++------
service/src/main/resources/quartz.properties | 22 +++++++------
service/src/main/resources/sparkJob.properties | 22 +++++++------
.../core/measure/MeasureControllerTest.java | 32 ++++++++++---------
.../core/measure/MeasureServiceImplTest.java | 30 ++++++++++--------
.../core/measure/repo/MeasureRepoTest.java | 32 ++++++++++---------
.../metastore/HiveMetastoreControllerTest.java | 32 ++++++++++---------
.../metastore/HiveMetastoreServiceImplTest.java | 32 ++++++++++---------
.../metastore/KafkaSchemaControllerTest.java | 32 ++++++++++---------
.../metastore/KafkaSchemaServiceImplTest.java | 28 ++++++++++-------
.../core/metric/MetricControllerTest.java | 32 ++++++++++---------
.../core/metric/MetricServiceImplTest.java | 28 ++++++++++-------
.../core/schedule/SchedulerControllerTest.java | 32 ++++++++++---------
.../core/schedule/SchedulerServiceImplTest.java | 32 ++++++++++---------
.../core/schedule/SparkSubmitJobTest.java | 32 ++++++++++---------
.../core/service/GriffinControllerTest.java | 32 ++++++++++---------
.../test/resources/application-test.properties | 21 +++++++------
.../src/test/resources/application.properties | 21 +++++++------
service/src/test/resources/quartz.properties | 21 +++++++------
ui/build.xml | 24 ++++++++------
ui/css/main.css | 33 +++++++++++---------
ui/css/sidebar.css | 32 ++++++++++---------
ui/css/treeview-check.css | 28 ++++++++++-------
ui/css/treeview.css | 28 ++++++++++-------
ui/index.html | 29 +++++++++--------
ui/js/app.js | 28 ++++++++++-------
ui/js/bs.js | 28 ++++++++++-------
ui/js/controllers/bigChart-ctrl.js | 28 ++++++++++-------
ui/js/controllers/createdataasset-ctrl.js | 32 ++++++++++---------
ui/js/controllers/createjob-ac-ctrl.js | 32 ++++++++++---------
ui/js/controllers/createjob0.js | 32 ++++++++++---------
ui/js/controllers/createrule-ac-ctrl.js | 32 ++++++++++---------
ui/js/controllers/createrule-an-ctrl.js | 32 ++++++++++---------
ui/js/controllers/createrule-pu-ctrl.js | 32 ++++++++++---------
ui/js/controllers/createrule-va-ctrl.js | 32 ++++++++++---------
ui/js/controllers/createrule0-ctrl.js | 28 ++++++++++-------
ui/js/controllers/dataassets-ctrl.js | 32 ++++++++++---------
ui/js/controllers/detail-ctrl.js | 28 ++++++++++-------
ui/js/controllers/downloadSample-ctrl.js | 32 ++++++++++---------
ui/js/controllers/editdataasset-ctrl.js | 32 ++++++++++---------
ui/js/controllers/footer-ctrl.js | 32 ++++++++++---------
ui/js/controllers/health-ctrl.js | 28 ++++++++++-------
ui/js/controllers/index.js | 28 ++++++++++-------
ui/js/controllers/job-ctrl.js | 32 ++++++++++---------
ui/js/controllers/main-ctrl.js | 32 ++++++++++---------
ui/js/controllers/metrics-ctrl.js | 32 ++++++++++---------
ui/js/controllers/module.js | 28 ++++++++++-------
ui/js/controllers/mydashboard-ctrl.js | 32 ++++++++++---------
ui/js/controllers/nav-ctrl.js | 28 ++++++++++-------
ui/js/controllers/rule-ctrl.js | 33 +++++++++++---------
ui/js/controllers/sidebar-ctrl.js | 32 ++++++++++---------
ui/js/controllers/subscribemodel-ctrl.js | 32 ++++++++++---------
ui/js/controllers/viewrule-ctrl.js | 32 ++++++++++---------
ui/js/directives/bigchart.js | 28 ++++++++++-------
ui/js/directives/index.js | 28 ++++++++++-------
ui/js/directives/module.js | 28 ++++++++++-------
ui/js/filters/index.js | 28 ++++++++++-------
ui/js/filters/module.js | 28 ++++++++++-------
ui/js/filters/strmap.js | 28 ++++++++++-------
ui/js/filters/strshorten.js | 28 ++++++++++-------
ui/js/main.js | 28 ++++++++++-------
ui/js/routes.js | 32 ++++++++++---------
ui/js/services/bark-chart.js | 28 ++++++++++-------
ui/js/services/index.js | 29 +++++++++--------
ui/js/services/module.js | 28 ++++++++++-------
ui/js/services/services.js | 32 ++++++++++---------
ui/login/login.css | 28 ++++++++++-------
ui/login/login.html | 29 ++++++++++-------
ui/login/login.js | 33 +++++++++++---------
ui/pages/dataassets/confirmation-dataasset.html | 29 +++++++++--------
.../confirmation-delete-dataasset.html | 29 +++++++++--------
ui/pages/dataassets/createdataasset.html | 29 +++++++++--------
ui/pages/dataassets/dataassets.html | 25 ++++++++-------
ui/pages/dataassets/editdataasset.html | 29 +++++++++--------
ui/pages/health/health.html | 25 ++++++++-------
ui/pages/jobs/confirmation-ac.html | 29 +++++++++--------
ui/pages/jobs/createjob-ac.html | 29 +++++++++--------
ui/pages/jobs/createjob0.html | 25 ++++++++-------
ui/pages/jobs/delete-confirm.html | 29 +++++++++--------
ui/pages/jobs/jobs.html | 25 ++++++++-------
ui/pages/measures/confirmation-ac.html | 29 +++++++++--------
ui/pages/measures/confirmation-an.html | 29 +++++++++--------
ui/pages/measures/confirmation-pu.html | 29 +++++++++--------
ui/pages/measures/confirmation-va.html | 29 +++++++++--------
ui/pages/measures/createrule-ac.html | 29 +++++++++--------
ui/pages/measures/createrule-an.html | 29 +++++++++--------
ui/pages/measures/createrule-pu.html | 29 +++++++++--------
ui/pages/measures/createrule-va.html | 29 +++++++++--------
ui/pages/measures/createrule0.html | 29 +++++++++--------
ui/pages/measures/delete-confirm.html | 29 +++++++++--------
ui/pages/measures/detail.html | 29 +++++++++--------
ui/pages/measures/measure.css | 28 ++++++++++-------
ui/pages/measures/measures.html | 25 ++++++++-------
ui/pages/measures/va-explaination.html | 25 ++++++++-------
ui/pages/measures/viewrule.html | 29 +++++++++--------
ui/pages/metrics/dashboard.html | 29 +++++++++--------
ui/pages/metrics/download-sample.html | 29 +++++++++--------
ui/pages/metrics/metrics.css | 24 ++++++++------
.../mydashboard/confirmation-subscribe.html | 29 +++++++++--------
ui/pages/mydashboard/mydashboard.html | 29 +++++++++--------
ui/pages/mydashboard/subscribemodel.html | 25 ++++++++-------
ui/pages/template/bigchart.css | 26 ++++++++-------
ui/pages/template/bigchart.html | 25 ++++++++-------
ui/pages/template/undercons.html | 25 ++++++++-------
ui/pom.xml | 25 +++++++++------
ui/sidebar.html | 25 ++++++++-------
ui/src/main/java/jar/App.java | 27 +++++++++-------
ui/src/test/java/jar/AppTest.java | 33 +++++++++++---------
ui/tests/ut/karma.conf.js | 31 ++++++++++--------
.../specs/controllers/createjob-ac-ctrl.spec.js | 31 ++++++++++--------
.../controllers/createrule-ac-ctrl.spec.js | 31 ++++++++++--------
.../controllers/createrule-pu-ctrl.spec.js | 31 ++++++++++--------
.../controllers/createrule-va-ctrl.spec.js | 31 ++++++++++--------
.../specs/controllers/createrule0-ctrl.spec.js | 25 +++++++++------
.../ut/specs/controllers/health-ctrl.spec.js | 25 +++++++++------
ui/tests/ut/specs/controllers/job-ctrl.spec.js | 32 ++++++++++---------
.../ut/specs/controllers/metrics-ctrl.spec.js | 25 +++++++++------
ui/tests/ut/specs/controllers/nav-ctrl_spec.js | 31 ++++++++++--------
ui/tests/ut/specs/controllers/rule-ctrl.spec.js | 31 ++++++++++--------
.../ut/specs/controllers/sidebar-ctrl_spec.js | 25 +++++++++------
.../ut/specs/controllers/viewrule-ctrl.spec.js | 25 +++++++++------
ui/tests/ut/specs/filters/strmap_spec.js | 31 ++++++++++--------
ui/tests/ut/specs/filters/strshorten_spec.js | 25 +++++++++------
ui/tests/ut/specs/services/services_spec.js | 25 +++++++++------
ui/tests/ut/test-main.js | 25 +++++++++------
259 files changed, 4305 insertions(+), 3342 deletions(-)
----------------------------------------------------------------------
[6/6] incubator-griffin git commit: [maven-release-plugin] prepare
release griffin-0.1.5-incubating
Posted by gu...@apache.org.
[maven-release-plugin] prepare release griffin-0.1.5-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/5107e505
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/5107e505
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/5107e505
Branch: refs/heads/griffin-0.1.5-incubating-rc3
Commit: 5107e50588bd58d31995c0a7f91a64e94c3d4f34
Parents: 3e5935d
Author: William Guo <gu...@icloud.com>
Authored: Mon Jul 10 08:54:17 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Mon Jul 10 08:54:17 2017 +0800
----------------------------------------------------------------------
measure/pom.xml | 2 +-
pom.xml | 4 ++--
service/pom.xml | 2 +-
ui/pom.xml | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/5107e505/measure/pom.xml
----------------------------------------------------------------------
diff --git a/measure/pom.xml b/measure/pom.xml
index f93f201..008426f 100644
--- a/measure/pom.xml
+++ b/measure/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.griffin</groupId>
<artifactId>griffin-parent</artifactId>
- <version>0.1.5-incubating-SNAPSHOT</version>
+ <version>0.1.5-incubating</version>
</parent>
<artifactId>measure</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/5107e505/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1556877..50a6551 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
<groupId>org.apache.griffin</groupId>
<artifactId>griffin-parent</artifactId>
- <version>0.1.5-incubating-SNAPSHOT</version>
+ <version>0.1.5-incubating</version>
<packaging>pom</packaging>
<name>Apache Griffin ${project.version}</name>
<url>http://griffin.incubator.apache.org</url>
@@ -82,7 +82,7 @@ under the License.
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-griffin.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-griffin.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf?p=incubator-griffin.git;a=summary</url>
- <tag>HEAD</tag>
+ <tag>griffin-0.1.5-incubating</tag>
</scm>
<distributionManagement>
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/5107e505/service/pom.xml
----------------------------------------------------------------------
diff --git a/service/pom.xml b/service/pom.xml
index 36b0ad1..d71ac97 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.griffin</groupId>
<artifactId>griffin-parent</artifactId>
- <version>0.1.5-incubating-SNAPSHOT</version>
+ <version>0.1.5-incubating</version>
</parent>
<artifactId>service</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/5107e505/ui/pom.xml
----------------------------------------------------------------------
diff --git a/ui/pom.xml b/ui/pom.xml
index 9433e71..b8836b5 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.griffin</groupId>
<artifactId>griffin-parent</artifactId>
- <version>0.1.5-incubating-SNAPSHOT</version>
+ <version>0.1.5-incubating</version>
</parent>
<artifactId>ui</artifactId>
<packaging>pom</packaging>
[2/6] incubator-griffin git commit: Merge branch 'master' of
https://github.com/apache/incubator-griffin
Posted by gu...@apache.org.
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/33936127
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/33936127
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/33936127
Branch: refs/heads/griffin-0.1.5-incubating-rc3
Commit: 339361272e5673bc5ab8c9bb03eaf1e28ffae79d
Parents: 3c640c2 651bc68
Author: William Guo <gu...@icloud.com>
Authored: Fri Jul 7 14:40:04 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Fri Jul 7 14:40:04 2017 +0800
----------------------------------------------------------------------
ui/login/login.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[5/6] incubator-griffin git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-griffin
Posted by gu...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/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/3e5935d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/3e5935d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/3e5935d5
Branch: refs/heads/griffin-0.1.5-incubating-rc3
Commit: 3e5935d54b20dbf3d019cd8415bdbe2c77d0c10d
Parents: a8676c9 fb3c197
Author: William Guo <gu...@icloud.com>
Authored: Mon Jul 10 08:07:29 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Mon Jul 10 08:07:29 2017 +0800
----------------------------------------------------------------------
ui/js/controllers/createjob-ac-ctrl.js | 1 -
ui/js/controllers/job-ctrl.js | 1 +
ui/pages/jobs/createjob-ac.html | 16 ++++++++--------
3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
[4/6] incubator-griffin git commit: Merge branch 'master' of
https://github.com/apache/incubator-griffin
Posted by gu...@apache.org.
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/a8676c99
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/a8676c99
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/a8676c99
Branch: refs/heads/griffin-0.1.5-incubating-rc3
Commit: a8676c99fbc8ef4c4f305b8928434acc185be78b
Parents: 2599d64 0370c21
Author: William Guo <gu...@icloud.com>
Authored: Mon Jul 10 07:55:06 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Mon Jul 10 07:55:06 2017 +0800
----------------------------------------------------------------------
ui/js/controllers/createjob-ac-ctrl.js | 8 ++++----
ui/js/controllers/job-ctrl.js | 10 +++++++---
ui/pages/jobs/createjob-ac.html | 10 +++++-----
ui/pages/jobs/jobs.html | 4 +++-
4 files changed, 19 insertions(+), 13 deletions(-)
----------------------------------------------------------------------