Merge remote-tracking branch 'origin/ignite-857' into ignite-857
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8574a19b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8574a19b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8574a19b Branch: refs/heads/ignite-868 Commit: 8574a19bc010e73cccecfa1cd648709dc55b47aa Parents: fd6f398 8deb577 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Wed May 27 19:16:25 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Wed May 27 19:16:25 2015 +0300 ---------------------------------------------------------------------- modules/mesos/licenses/jetty-epl-license.txt | 69 +++ modules/mesos/pom.xml | 42 +- .../apache/ignite/mesos/ClusterProperties.java | 502 +++++++++++++++++++ .../apache/ignite/mesos/IgniteFramework.java | 119 +++++ .../apache/ignite/mesos/IgniteScheduler.java | 349 +++++++++++++ .../org/apache/ignite/mesos/IgniteTask.java | 86 ++++ .../org/apache/ignite/mesos/package-info.java | 22 + .../ignite/mesos/resource/IgniteProvider.java | 234 +++++++++ .../ignite/mesos/resource/JettyServer.java | 61 +++ .../ignite/mesos/resource/ResourceHandler.java | 142 ++++++ .../ignite/mesos/resource/ResourceProvider.java | 120 +++++ .../ignite/mesos/resource/package-info.java | 22 + .../ignite/messo/IgniteAmazonScheduler.java | 81 --- .../apache/ignite/messo/IgniteFramework.java | 108 ---- .../apache/ignite/messo/IgniteScheduler.java | 229 --------- .../org/apache/ignite/messo/package-info.java | 22 - .../main/resources/ignite-default-config.xml | 35 ++ modules/mesos/src/main/resources/log4j2.xml | 35 ++ .../org/apache/ignite/IgniteMesosTestSuite.java | 38 ++ .../ignite/mesos/IgniteSchedulerSelfTest.java | 420 ++++++++++++++++ 20 files changed, 2293 insertions(+), 443 deletions(-) ----------------------------------------------------------------------
