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 ae24a31fb84ed715435636839a5ebe2c8e5bbf01
Merge: 862675d 298328f
Author: Yifei Zhang <yifei.z.l...@gmail.com>
AuthorDate: Fri Jun 21 14:32:35 2019 -0300
Merge pull request #6 from apache/develop
Sync develop branch with apache repo
engine-executor/build.sbt | 4 ++--
...sembly.jar => marvin-engine-executor-assembly.jar} | Bin
.../org/marvin/artifact/manager/ArtifactFSSaver.scala | 6 +++---
.../marvin/artifact/manager/ArtifactHdfsSaver.scala | 6 +++---
.../org/marvin/artifact/manager/ArtifactS3Saver.scala | 6 +++---
.../org/marvin/artifact/manager/ArtifactSaver.scala | 6 +++---
.../marvin/exception/MarvinEExecutorException.scala | 2 +-
.../scala/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 +-
.../org/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 +-
.../src/main/scala/org/marvin/util/ProtocolUtil.scala | 4 ++--
.../marvin/artifact/manager/ArtifactS3SaverTest.scala | 8 ++++----
.../marvin/artifact/manager/ArtifactSaverTest.scala | 10 +++++-----
.../org/marvin/executor/EngineExecutorAppTest.scala | 8 ++++----
.../org/marvin/executor/actions/BatchActionTest.scala | 16 ++++++++--------
.../marvin/executor/actions/OnlineActionTest.scala | 14 +++++++-------
.../org/marvin/executor/api/GenericAPITest.scala | 16 ++++++++--------
.../marvin/executor/manager/ExecutorManagerTest.scala | 8 ++++----
.../executor/proxies/BatchActionProxyTest.scala | 8 ++++----
.../executor/proxies/OnlineActionProxyTest.scala | 8 ++++----
.../executor/statemachine/PredictorFSMTest.scala | 10 +++++-----
.../test/scala/org/marvin/fixtures/MetadataMock.scala | 4 ++--
.../src/test/scala/org/marvin/util/JsonUtilTest.scala | 4 ++--
.../test/scala/org/marvin/util/LocalCacheTest.scala | 2 +-
.../test/scala/org/marvin/util/ProtocolUtilTest.scala | 6 +++---
python-toolbox/setup.py | 1 -
40 files changed, 145 insertions(+), 146 deletions(-)
