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 256FB177C7 for ; Tue, 7 Apr 2015 09:14:59 +0000 (UTC) Received: (qmail 44452 invoked by uid 500); 7 Apr 2015 09:14:59 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 44389 invoked by uid 500); 7 Apr 2015 09:14:59 -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 44370 invoked by uid 99); 7 Apr 2015 09:14:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Apr 2015 09:14:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 07 Apr 2015 09:14:57 +0000 Received: (qmail 44221 invoked by uid 99); 7 Apr 2015 09:14:37 -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, 07 Apr 2015 09:14:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3A817E0772; Tue, 7 Apr 2015 09:14:37 +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: Tue, 07 Apr 2015 09:14:39 -0000 Message-Id: <13f413a71add4d5cb52dba66d91e6e7f@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [03/37] incubator-ignite git commit: Merge branches 'ignite-593' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-593 X-Virus-Checked: Checked by ClamAV on apache.org Merge branches 'ignite-593' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-593 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/58b6ceb2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/58b6ceb2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/58b6ceb2 Branch: refs/heads/ignite-180-1 Commit: 58b6ceb2722f2738f772cf373f98dc7d6901adf2 Parents: 238e124 214a461 Author: AKuznetsov Authored: Thu Apr 2 18:00:33 2015 +0700 Committer: AKuznetsov Committed: Thu Apr 2 18:00:33 2015 +0700 ---------------------------------------------------------------------- .../transactions/IgniteTxLocalAdapter.java | 4 +- .../processors/igfs/IgsfStartCacheTest.java | 115 +++++++++++++++++++ 2 files changed, 117 insertions(+), 2 deletions(-) ----------------------------------------------------------------------