You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/06/11 20:36:00 UTC
[1/2] incubator-ignite git commit: Merge branch 'ignite-gg-10052' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10249
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-gg-10052 6ad37e14f -> 6e6a8fb08
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-10052
Commit: e4a7b8638f72a69a3bc392dc69c5de5cafae21ef
Parents: b76ed93 9cbecbc
Author: iveselovskiy <iv...@gridgain.com>
Authored: Thu Jun 11 20:30:13 2015 +0300
Committer: iveselovskiy <iv...@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(-)
----------------------------------------------------------------------
[2/2] incubator-ignite git commit: Merge branch 'ignite-gg-10052' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10249
Posted by sb...@apache.org.
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/6e6a8fb0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6e6a8fb0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6e6a8fb0
Branch: refs/heads/ignite-gg-10052
Commit: 6e6a8fb0832033c78d1e0590558659f39aecd596
Parents: e4a7b86 6ad37e1
Author: iveselovskiy <iv...@gridgain.com>
Authored: Thu Jun 11 21:17:12 2015 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Thu Jun 11 21:17:12 2015 +0300
----------------------------------------------------------------------
.../cache/GridCacheSwapReloadSelfTest.java | 21 ++++++++++++++++----
.../cache/IgniteCachePeekModesAbstractTest.java | 4 ++--
2 files changed, 19 insertions(+), 6 deletions(-)
----------------------------------------------------------------------