Merge branch 'ignite-gg-10052' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10249
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e4a7b863 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e4a7b863 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e4a7b863 Branch: refs/heads/ignite-gg-10123 Commit: e4a7b8638f72a69a3bc392dc69c5de5cafae21ef Parents: b76ed93 9cbecbc Author: iveselovskiy <iveselovs...@gridgain.com> Authored: Thu Jun 11 20:30:13 2015 +0300 Committer: iveselovskiy <iveselovs...@gridgain.com> Committed: Thu Jun 11 20:30:13 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 8 ++++++++ .../org/apache/ignite/internal/IgniteKernal.java | 2 +- modules/mesos/README.txt | 2 +- .../org/apache/ignite/mesos/ClusterProperties.java | 15 +++++++++++++++ .../org/apache/ignite/mesos/IgniteScheduler.java | 10 +++++++--- 5 files changed, 32 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
