| commit | 912111397ab59cd31a1df8c3e911bc780e4a459d | [log] [tgz] |
|---|---|---|
| author | Yariv Triffon <yarivt@gmail.com> | Fri May 03 11:14:43 2019 +1000 |
| committer | Yariv Triffon <yarivt@gmail.com> | Fri May 03 11:14:43 2019 +1000 |
| tree | faa00f01ea63ea1a4252661842eb3d814f4d033f | |
| parent | edd4955a7a729424a4ac4aa4a6065871bdd78446 [diff] | |
| parent | b0b64727b101c674ea831a8ac4ce49221f5fef75 [diff] |
Merge branch 'master' of https://github.com/apache/incubator-amaterasu # Conflicts: # common/src/main/kotlin/org/apache/amaterasu/common/configuration/enums/ActionStatus.kt # frameworks/spark/dispatcher/src/main/scala/org/apache/amaterasu/frameworks/spark/dispatcher/SparkSetupProvider.scala # leader/src/main/scala/org/apache/amaterasu/leader/execution/JobManager.scala # leader/src/main/scala/org/apache/amaterasu/leader/mesos/schedulers/JobScheduler.scala