fixed merge issue
authorYaniv Rodenski <roadan@gmail.com>
Sun, 22 Apr 2018 08:56:40 +0000 (18:56 +1000)
committerYaniv Rodenski <roadan@gmail.com>
Sun, 22 Apr 2018 08:56:40 +0000 (18:56 +1000)
commit5b4e8eb2bd564af37cbcda929720d75323bb1cfb
tree16344d5be921aad40ee98c95f5d387131a535a13
parent14acb597616d22d4cbf5a9fe0df3f7d9215f1f8f
fixed merge issue
executor/src/main/scala/org/apache/spark/repl/amaterasu/runners/spark/SparkRunnerHelper.scala
leader/src/main/scala/org/apache/amaterasu/leader/mesos/schedulers/JobScheduler.scala
leader/src/main/scala/org/apache/amaterasu/leader/yarn/ApplicationMaster.scala
leader/src/main/scala/org/apache/amaterasu/leader/yarn/YarnRMCallbackHandler.scala
leader/src/main/scripts/ama-start-yarn.sh
leader/src/main/scripts/amaterasu.properties