This is an automated email from the ASF dual-hosted git repository.
rafaelnovello pushed a change to branch MARVIN-59
in repository https://gitbox.apache.org/repos/asf/incubator-marvin.git.
from a7db5b2 Updating Dockerfile to use Python 3
add 862675d Merge pull request #4 from apache/develop
add 5df6996 Setting for Engine-Executor deployment to Apache Nexus
add 7ddab0f revert-rename
add 298328f Merge branch 'pr/25' into develop
add ae24a31 Merge pull request #6 from apache/develop
add ad68c71 Merge branch 'develop' of github.com:oldfly/incubator-marvin
into develop
add 9d59199 IDE local conf file deleted
add ffc6cca Update the engine template Dockerfile to install opensdk
add 4b2708f Removing process-dependency-links option from pip install
add 3fea8f1 Merge branch 'pr/26' into develop
add 417004a Bump sbt from 0.13 to 1.x
add 6d9d401 Merge branch 'develop' into develop
add 64dd814 Merge branch 'develop' into MARVIN-59
No new revisions were added by this update.
Summary of changes:
.travis.yml | 2 +-
engine-executor/build.sbt | 19 +++++++++++++------
...embly.jar => marvin-engine-executor-assembly.jar} | Bin
engine-executor/project/assembly.sbt | 2 +-
engine-executor/project/build.properties | 2 +-
engine-executor/project/plugins.sbt | 7 +++----
engine-executor/project/scalapb.sbt | 4 ++--
engine-executor/sonatype.sbt | 2 +-
.../marvin/artifact/manager/ArtifactFSSaver.scala | 6 +++---
.../marvin/artifact/manager/ArtifactHdfsSaver.scala | 6 +++---
.../marvin/artifact/manager/ArtifactS3Saver.scala | 6 +++---
.../org/marvin/artifact/manager/ArtifactSaver.scala | 6 +++---
.../marvin/exception/MarvinEExecutorException.scala | 2 +-
.../org/marvin/executor/EngineExecutorApp.scala | 16 ++++++++--------
.../org/marvin/executor/actions/BatchAction.scala | 18 +++++++++---------
.../org/marvin/executor/actions/OnlineAction.scala | 16 ++++++++--------
.../org/marvin/executor/actions/PipelineAction.scala | 18 +++++++++---------
.../scala/org/marvin/executor/api/GenericAPI.scala | 16 ++++++++--------
.../org/marvin/executor/api/GenericAPIHandlers.scala | 4 ++--
.../executor/manager/ExecutorClusterListener.scala | 2 +-
.../marvin/executor/manager/ExecutorManager.scala | 6 +++---
.../marvin/executor/proxies/BatchActionProxy.scala | 6 +++---
.../org/marvin/executor/proxies/EngineProxy.scala | 4 ++--
.../marvin/executor/proxies/OnlineActionProxy.scala | 6 +++---
.../marvin/executor/statemachine/PredictorFSM.scala | 12 ++++++------
.../main/scala/org/marvin/model/BatchExecution.scala | 2 +-
.../src/main/scala/org/marvin/model/Metadata.scala | 2 +-
.../scala/org/marvin/util/ConfigurationContext.scala | 2 +-
.../src/main/scala/org/marvin/util/JsonUtil.scala | 2 +-
.../src/main/scala/org/marvin/util/LocalCache.scala | 2 +-
.../main/scala/org/marvin/util/ProtocolUtil.scala | 4 ++--
.../artifact/manager/ArtifactS3SaverTest.scala | 8 ++++----
.../marvin/artifact/manager/ArtifactSaverTest.scala | 10 +++++-----
.../org/marvin/executor/EngineExecutorAppTest.scala | 8 ++++----
.../marvin/executor/actions/BatchActionTest.scala | 16 ++++++++--------
.../marvin/executor/actions/OnlineActionTest.scala | 14 +++++++-------
.../org/marvin/executor/api/GenericAPITest.scala | 16 ++++++++--------
.../executor/manager/ExecutorManagerTest.scala | 8 ++++----
.../executor/proxies/BatchActionProxyTest.scala | 8 ++++----
.../executor/proxies/OnlineActionProxyTest.scala | 8 ++++----
.../executor/statemachine/PredictorFSMTest.scala | 10 +++++-----
.../scala/org/marvin/fixtures/MetadataMock.scala | 4 ++--
.../test/scala/org/marvin/util/JsonUtilTest.scala | 4 ++--
.../test/scala/org/marvin/util/LocalCacheTest.scala | 2 +-
.../scala/org/marvin/util/ProtocolUtilTest.scala | 6 +++---
.../management/templates/python-engine/Dockerfile | 10 +++-------
python-toolbox/setup.py | 1 -
47 files changed, 168 insertions(+), 167 deletions(-)
rename engine-executor/build/{marvin-engine-server-assembly.jar =>
marvin-engine-executor-assembly.jar} (100%)
