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 6B54318613 for ; Thu, 9 Jul 2015 11:30:05 +0000 (UTC) Received: (qmail 92213 invoked by uid 500); 9 Jul 2015 11:30:05 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 92184 invoked by uid 500); 9 Jul 2015 11:30:05 -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 92171 invoked by uid 99); 9 Jul 2015 11:30:05 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Jul 2015 11:30:05 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id BE80AC0052 for ; Thu, 9 Jul 2015 11:30:04 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, 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 (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id GY4U4lrzXWuR for ; Thu, 9 Jul 2015 11:29:50 +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 B9B8A4E218 for ; Thu, 9 Jul 2015 11:29:40 +0000 (UTC) Received: (qmail 88769 invoked by uid 99); 9 Jul 2015 11:29:40 -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; Thu, 09 Jul 2015 11:29:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DE229E6833; Thu, 9 Jul 2015 11:29:39 +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: Thu, 09 Jul 2015 11:30:00 -0000 Message-Id: <83103bda746d423eae7798fb33a0d7da@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [22/30] incubator-ignite git commit: Merge remote-tracking branch 'origin/master' Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fa5cb918 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fa5cb918 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fa5cb918 Branch: refs/heads/ignite-929 Commit: fa5cb918dcb0fe4253332fd9be859803ad014ddb Parents: 459d702 4c9d8c2 Author: Yakov Zhdanov Authored: Wed Jul 8 19:39:36 2015 +0300 Committer: Yakov Zhdanov Committed: Wed Jul 8 19:39:36 2015 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 4 + .../configuration/TransactionConfiguration.java | 23 +++ .../processors/cache/GridCacheAttributes.java | 3 + .../processors/cache/GridCacheContext.java | 8 +- .../processors/cache/GridCacheIoManager.java | 8 +- .../processors/cache/GridCacheProcessor.java | 21 +- .../cache/GridCacheSharedContext.java | 15 +- .../distributed/near/GridNearGetFuture.java | 4 +- .../cache/jta/CacheJtaManagerAdapter.java | 17 +- .../cache/jta/CacheNoopJtaManager.java | 2 +- .../visor/cache/VisorCacheConfiguration.java | 11 - .../cache/CacheFutureExceptionSelfTest.java | 161 +++++++-------- .../loadtests/hashmap/GridCacheTestContext.java | 4 +- .../HibernateTransactionalDataRegion.java | 12 +- .../hibernate/HibernateL2CacheSelfTest.java | 7 +- .../HibernateL2CacheTransactionalSelfTest.java | 5 - .../apache/ignite/cache/jta/CacheTmLookup.java | 3 +- .../processors/cache/jta/CacheJtaManager.java | 72 ++++++- .../cache/jta/GridCacheXAResource.java | 16 +- .../processors/cache/GridCacheJtaSelfTest.java | 52 +++-- .../GridTmLookupLifecycleAwareSelfTest.java | 29 ++- modules/kafka/licenses/apache-2.0.txt | 202 +++++++++++++++++++ modules/kafka/pom.xml | 11 - .../commands/cache/VisorCacheCommand.scala | 2 - .../config/benchmark-index-put.properties | 64 ------ .../config/benchmark-put-indexed-val.properties | 64 ++++++ .../cache/IgnitePutIndex1Benchmark.java | 42 ---- .../cache/IgnitePutIndex2Benchmark.java | 42 ---- .../cache/IgnitePutIndexedValue1Benchmark.java | 42 ++++ .../cache/IgnitePutIndexedValue2Benchmark.java | 42 ++++ .../cache/IgnitePutIndexedValue8Benchmark.java | 2 +- .../ignite/yardstick/cache/model/Person1.java | 29 +-- .../ignite/yardstick/cache/model/Person2.java | 45 +---- .../ignite/yardstick/cache/model/Person8.java | 155 +------------- 34 files changed, 661 insertions(+), 558 deletions(-) ----------------------------------------------------------------------