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 31F68183F5 for ; Mon, 21 Sep 2015 14:16:20 +0000 (UTC) Received: (qmail 42873 invoked by uid 500); 21 Sep 2015 14:16:20 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 42798 invoked by uid 500); 21 Sep 2015 14:16:20 -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 42756 invoked by uid 99); 21 Sep 2015 14:16: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, 21 Sep 2015 14:16:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EF56EE0332; Mon, 21 Sep 2015 14:16:19 +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: Mon, 21 Sep 2015 14:16:20 -0000 Message-Id: <8dd64b4064684eb684b928386147b1e7@git.apache.org> In-Reply-To: <06b319d5a43948fd8848d18098e0847f@git.apache.org> References: <06b319d5a43948fd8848d18098e0847f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/10] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4 Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d08ecf11 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d08ecf11 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d08ecf11 Branch: refs/heads/ignite-1282 Commit: d08ecf11704b9b4b56ea81f9f03d10311ff9d27c Parents: 4c101dc d64fc9d Author: sboikov Authored: Fri Sep 18 14:11:41 2015 +0300 Committer: sboikov Committed: Fri Sep 18 14:11:41 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------