Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9FC1B200C61 for ; Tue, 25 Apr 2017 16:43:15 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9E79D160BBC; Tue, 25 Apr 2017 14:43:15 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 17C71160BB8 for ; Tue, 25 Apr 2017 16:43:14 +0200 (CEST) Received: (qmail 51721 invoked by uid 500); 25 Apr 2017 14:43:14 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 51595 invoked by uid 99); 25 Apr 2017 14:43:13 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Apr 2017 14:43:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EBCBEE0898; Tue, 25 Apr 2017 14:43:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.apache.org Date: Tue, 25 Apr 2017 14:43:15 -0000 Message-Id: In-Reply-To: <231a6633f6144a58af94bfdc2f5cbda8@git.apache.org> References: <231a6633f6144a58af94bfdc2f5cbda8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/7] ignite git commit: Merge remote-tracking branch 'origin/ignite-2.0' into ignite-2.0 archived-at: Tue, 25 Apr 2017 14:43:15 -0000 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-5072 Commit: 712398e1254867f38556c941094edb23c9b346ae Parents: 860049d 4e4a22d Author: devozerov Authored: Tue Apr 25 12:14:48 2017 +0300 Committer: devozerov 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(-) ----------------------------------------------------------------------