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 B75D318C3D for ; Fri, 25 Sep 2015 13:21:46 +0000 (UTC) Received: (qmail 63944 invoked by uid 500); 25 Sep 2015 13:21:46 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 63868 invoked by uid 500); 25 Sep 2015 13:21:46 -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 63853 invoked by uid 99); 25 Sep 2015 13:21:46 -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, 25 Sep 2015 13:21:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7CB03E00DE; Fri, 25 Sep 2015 13:21:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Fri, 25 Sep 2015 13:21:47 -0000 Message-Id: <84b7d053b6e548f3bd779b4d62a4cb69@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] ignite git commit: Merge remote-tracking branch 'origin/master' Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/343191bc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/343191bc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/343191bc Branch: refs/heads/master Commit: 343191bce46f9d745c1c0151ba86ac6032e76f16 Parents: a6306a5 a42750a Author: Anton Vinogradov Authored: Fri Sep 25 16:21:42 2015 +0300 Committer: Anton Vinogradov Committed: Fri Sep 25 16:21:42 2015 +0300 ---------------------------------------------------------------------- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 5 + .../internal/GridUpdateNotifierSelfTest.java | 1 + ...nedQueueFailoverDataConsistencySelfTest.java | 5 - .../GridCacheReplicatedInvalidateSelfTest.java | 249 ------------------- ...eCacheExpiryPolicyWithStoreAbstractTest.java | 5 +- .../multijvm/IgniteCacheProcessProxy.java | 3 +- .../testsuites/IgniteCacheTestSuite3.java | 2 - 7 files changed, 12 insertions(+), 258 deletions(-) ----------------------------------------------------------------------