You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/04/26 09:31:44 UTC

[23/29] ignite git commit: Merge remote-tracking branch 'origin/ignite-2.0' into ignite-2.0

Merge remote-tracking branch 'origin/ignite-2.0' into ignite-2.0


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/712398e1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/712398e1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/712398e1

Branch: refs/heads/ignite-5024
Commit: 712398e1254867f38556c941094edb23c9b346ae
Parents: 860049d 4e4a22d
Author: devozerov <vo...@gridgain.com>
Authored: Tue Apr 25 12:14:48 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Tue Apr 25 12:14:48 2017 +0300

----------------------------------------------------------------------
 .../configuration/CacheConfiguration.java       |  57 ++--
 .../configuration/MemoryConfiguration.java      |  12 +-
 .../MemoryPolicyConfiguration.java              |   6 +-
 .../IgniteCacheDatabaseSharedManager.java       | 130 ++++----
 .../cache/MemoryPolicyConfigValidationTest.java |   6 +-
 .../MemoryPolicyInitializationTest.java         | 307 +++++++++++++++++++
 .../testsuites/IgniteCacheTestSuite2.java       |   2 +
 .../Cache/Configuration/MemoryConfiguration.cs  |   7 +
 .../Configuration/MemoryPolicyConfiguration.cs  |   3 +
 .../frontend/app/data/event-groups.json         |  14 -
 .../frontend/app/modules/cluster/Cache.js       |   4 -
 .../app/modules/cluster/CacheMetrics.js         |   4 -
 modules/web-console/web-agent/pom.xml           |   2 +-
 .../ignite/console/agent/AgentLauncher.java     |  10 +-
 14 files changed, 446 insertions(+), 118 deletions(-)
----------------------------------------------------------------------