Repository: incubator-ignite Updated Branches: refs/heads/ignite-gg-10123 [created] b94ad86f5
Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10123 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/98f01143 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/98f01143 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/98f01143 Branch: refs/heads/ignite-gg-10123 Commit: 98f0114397c96a35565cd48cdc61774e4df097e9 Parents: b76ed93 e188e18 Author: iveselovskiy <iveselovs...@gridgain.com> Authored: Thu Jun 11 19:52:27 2015 +0300 Committer: iveselovskiy <iveselovs...@gridgain.com> Committed: Thu Jun 11 19:52:27 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(-) ----------------------------------------------------------------------