You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marvin.apache.org by we...@apache.org on 2019/05/29 19:55:03 UTC
[incubator-marvin] 01/01: Merge PR 23 into develop
This is an automated email from the ASF dual-hosted git repository.
weichen pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-marvin.git
commit c9890bc8c8e623341680f29540dabec650a0da52
Merge: 8226e06 3726382
Author: weichen <we...@apache.org>
AuthorDate: Wed May 29 14:52:13 2019 -0500
Merge PR 23 into develop
.travis.yml | 2 +-
.../.github/ISSUE_TEMPLATE/bug_report.md | 0
.../.github/ISSUE_TEMPLATE/custom.md | 0
.../.github/ISSUE_TEMPLATE/feature_request.md | 0
{engine-server => engine-executor}/.gitignore | 0
{engine-server => engine-executor}/CODE_OF_CONDUCT.md | 0
{engine-server => engine-executor}/Makefile | 0
{engine-server => engine-executor}/NOTICE | 0
{engine-server => engine-executor}/PULL_REQUEST_TEMPLATE.md | 0
{engine-server => engine-executor}/README.md | 0
{engine-server => engine-executor}/build.sbt | 2 +-
{engine-server => engine-executor}/build/Dockerfile | 0
.../build/docker-python/Dockerfile | 2 +-
.../build/docker-r/Dockerfile | 4 +++-
.../build/marvin-engine-server-assembly.jar | Bin
{engine-server => engine-executor}/build/python-toolbox.tgz | Bin
{engine-server => engine-executor}/project/assembly.sbt | 0
{engine-server => engine-executor}/project/build.properties | 0
{engine-server => engine-executor}/project/plugins.sbt | 0
{engine-server => engine-executor}/project/scalapb.sbt | 0
{engine-server => engine-executor}/sonatype.sbt | 0
.../src/main/protobuf/actions.proto | 0
.../src/main}/resources/EngineActionSchema.json | 0
.../src/main}/resources/EngineMetadataSchema.json | 0
.../src/main/resources/application.conf | 0
.../src/main/resources/docs/favicon-16x16.png | Bin
.../src/main/resources/docs/favicon-32x32.png | Bin
.../src/main/resources/docs/index.html | 0
.../src/main/resources/docs/oauth2-redirect.html | 0
.../src/main/resources/docs/swagger-ui-bundle.js | 0
.../src/main/resources/docs/swagger-ui-bundle.js.map | 0
.../src/main/resources/docs/swagger-ui-standalone-preset.js | 0
.../main/resources/docs/swagger-ui-standalone-preset.js.map | 0
.../src/main/resources/docs/swagger-ui.css | 0
.../src/main/resources/docs/swagger-ui.css.map | 0
.../src/main/resources/docs/swagger-ui.js | 0
.../src/main/resources/docs/swagger-ui.js.map | 0
.../src/main/resources/log4j.properties | 0
.../scala/org/marvin/artifact/manager/ArtifactFSSaver.scala | 0
.../org/marvin/artifact/manager/ArtifactHdfsSaver.scala | 0
.../scala/org/marvin/artifact/manager/ArtifactS3Saver.scala | 0
.../scala/org/marvin/artifact/manager/ArtifactSaver.scala | 0
.../org/marvin/exception/MarvinEExecutorException.scala | 0
.../main/scala/org/marvin/executor/EngineExecutorApp.scala | 0
.../scala/org/marvin/executor/actions/BatchAction.scala | 0
.../scala/org/marvin/executor/actions/OnlineAction.scala | 0
.../scala/org/marvin/executor/actions/PipelineAction.scala | 0
.../src/main/scala/org/marvin/executor/api/GenericAPI.scala | 0
.../scala/org/marvin/executor/api/GenericAPIHandlers.scala | 0
.../marvin/executor/manager/ExecutorClusterListener.scala | 0
.../scala/org/marvin/executor/manager/ExecutorManager.scala | 0
.../org/marvin/executor/proxies/BatchActionProxy.scala | 0
.../scala/org/marvin/executor/proxies/EngineProxy.scala | 0
.../org/marvin/executor/proxies/OnlineActionProxy.scala | 0
.../org/marvin/executor/statemachine/PredictorFSM.scala | 0
.../src/main/scala/org/marvin/model/BatchExecution.scala | 0
.../src/main/scala/org/marvin/model/Metadata.scala | 0
.../main/scala/org/marvin/util/ConfigurationContext.scala | 0
.../src/main/scala/org/marvin/util/JsonUtil.scala | 0
.../src/main/scala/org/marvin/util/LocalCache.scala | 0
.../src/main/scala/org/marvin/util/ProtocolUtil.scala | 0
.../src/test}/resources/EngineActionSchema.json | 0
.../src/test}/resources/EngineMetadataSchema.json | 0
.../src/test/resources/application.conf | 0
.../src/test/resources/engine_home/docs.yaml | 0
.../src/test/resources/engine_home/engine.metadata | 0
.../src/test/resources/engine_home/engine.params | 0
.../src/test/resources/engine_home/predictor-message.schema | 0
.../src/test/resources/metadataToValidate.json | 0
.../src/test/resources/metadataToValidateWithError.json | 0
.../src/test/resources/metadataToValidateWithRefError.json | 0
.../src/test/resources/test-invalid.json | 0
.../src/test/resources/test.json | 0
.../org/marvin/artifact/manager/ArtifactS3SaverTest.scala | 0
.../org/marvin/artifact/manager/ArtifactSaverTest.scala | 0
.../scala/org/marvin/executor/EngineExecutorAppTest.scala | 0
.../scala/org/marvin/executor/actions/BatchActionTest.scala | 0
.../org/marvin/executor/actions/OnlineActionTest.scala | 0
.../test/scala/org/marvin/executor/api/GenericAPITest.scala | 0
.../org/marvin/executor/manager/ExecutorManagerTest.scala | 0
.../org/marvin/executor/proxies/BatchActionProxyTest.scala | 0
.../org/marvin/executor/proxies/OnlineActionProxyTest.scala | 0
.../org/marvin/executor/statemachine/PredictorFSMTest.scala | 0
.../src/test/scala/org/marvin/fixtures/MetadataMock.scala | 0
.../src/test/scala/org/marvin/util/JsonUtilTest.scala | 0
.../src/test/scala/org/marvin/util/LocalCacheTest.scala | 0
.../src/test/scala/org/marvin/util/ProtocolUtilTest.scala | 0
87 files changed, 6 insertions(+), 4 deletions(-)