Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 47DA5180A9 for ; Fri, 27 Nov 2015 09:37:01 +0000 (UTC) Received: (qmail 5471 invoked by uid 500); 27 Nov 2015 09:37:01 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 5431 invoked by uid 500); 27 Nov 2015 09:37:01 -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 5351 invoked by uid 99); 27 Nov 2015 09:37:01 -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; Fri, 27 Nov 2015 09:37:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DCF83E058E; Fri, 27 Nov 2015 09:37:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Fri, 27 Nov 2015 09:37:03 -0000 Message-Id: <2ba4960b4ea140af81e040b0f184a5e2@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/4] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5 Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e4f6224f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e4f6224f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e4f6224f Branch: refs/heads/ignite-1.5 Commit: e4f6224fabc0561f6ff8de33a8a7721bca3370bc Parents: 663e78d c2d4d1d Author: vozerov-gridgain Authored: Fri Nov 27 12:37:50 2015 +0300 Committer: vozerov-gridgain Committed: Fri Nov 27 12:37:50 2015 +0300 ---------------------------------------------------------------------- .../CacheDataStructuresManager.java | 45 ++++++++++++-------- .../datastructures/DataStructuresProcessor.java | 20 +-------- ...gniteAtomicLongChangingTopologySelfTest.java | 30 ++++++++++--- 3 files changed, 53 insertions(+), 42 deletions(-) ----------------------------------------------------------------------