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 D44C51781B for ; Mon, 1 Jun 2015 09:45:29 +0000 (UTC) Received: (qmail 84154 invoked by uid 500); 1 Jun 2015 09:45:29 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 84121 invoked by uid 500); 1 Jun 2015 09:45:29 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 84112 invoked by uid 99); 1 Jun 2015 09:45:29 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2015 09:45:29 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 15B53181A34 for ; Mon, 1 Jun 2015 09:45:29 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id dg4pNaFFGZl7 for ; Mon, 1 Jun 2015 09:45:21 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 3B13943E3E for ; Mon, 1 Jun 2015 09:45:21 +0000 (UTC) Received: (qmail 84086 invoked by uid 99); 1 Jun 2015 09:45:20 -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; Mon, 01 Jun 2015 09:45:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A477BE0508; Mon, 1 Jun 2015 09:45:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 01 Jun 2015 09:45:21 -0000 Message-Id: <732fa070f3914c71a8434459f3a4767c@git.apache.org> In-Reply-To: <8a2e203d85ef4711938c7b5dff188df9@git.apache.org> References: <8a2e203d85ef4711938c7b5dff188df9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-840' into ignite-sprint-5 Merge remote-tracking branch 'remotes/origin/ignite-840' into ignite-sprint-5 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9a16d190 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9a16d190 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9a16d190 Branch: refs/heads/ignite-sprint-5 Commit: 9a16d1906b74e918a377cd9d5da6d96c8aeeaaad Parents: 00848cc 9f9a631 Author: sboikov Authored: Mon Jun 1 12:45:01 2015 +0300 Committer: sboikov Committed: Mon Jun 1 12:45:01 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheEntryEx.java | 6 ++++++ .../ignite/internal/processors/cache/GridCacheMapEntry.java | 5 +++++ .../cache/distributed/GridDistributedCacheEntry.java | 7 ------- .../processors/cache/distributed/dht/GridDhtCacheEntry.java | 6 +----- .../internal/processors/datastreamer/DataStreamerImpl.java | 2 ++ .../internal/processors/cache/GridCacheTestEntryEx.java | 4 ++++ .../datastreamer/DataStreamerMultiThreadedSelfTest.java | 2 -- 7 files changed, 18 insertions(+), 14 deletions(-) ----------------------------------------------------------------------