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 519A817E41 for ; Wed, 20 May 2015 15:24:46 +0000 (UTC) Received: (qmail 99993 invoked by uid 500); 20 May 2015 15:24:46 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 99960 invoked by uid 500); 20 May 2015 15:24:46 -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 99950 invoked by uid 99); 20 May 2015 15:24:46 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 May 2015 15:24:46 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id AC98B1A37D2 for ; Wed, 20 May 2015 15:24:45 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-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-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id L8EdYcKIfZMI for ; Wed, 20 May 2015 15:24:37 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 4228D24F91 for ; Wed, 20 May 2015 15:24:37 +0000 (UTC) Received: (qmail 99659 invoked by uid 99); 20 May 2015 15:24: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; Wed, 20 May 2015 15:24:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 070C7E0D59; Wed, 20 May 2015 15:24:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yzhdanov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 20 May 2015 15:24:38 -0000 Message-Id: <5644faabdc1442098c13ca7a1175a35b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [03/22] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4 Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b218e78a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b218e78a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b218e78a Branch: refs/heads/ignite-709_2 Commit: b218e78adb72d759e646a1042f44fa19b44cf09e Parents: 5de74fe 54f9492 Author: Alexey Goncharuk Authored: Tue May 5 11:17:56 2015 -0700 Committer: Alexey Goncharuk Committed: Tue May 5 11:17:56 2015 -0700 ---------------------------------------------------------------------- DEVNOTES.txt | 2 +- assembly/release-base.xml | 2 + assembly/release-schema-import.xml | 50 ++++ .../streaming/wordcount/CacheConfig.java | 5 - .../config/grid-client-config.properties | 50 ++-- .../ClientPropertiesConfigurationSelfTest.java | 12 +- .../java/org/apache/ignite/IgniteCache.java | 5 + .../org/apache/ignite/IgniteJdbcDriver.java | 81 ++++--- .../client/GridClientConfiguration.java | 2 +- .../managers/communication/GridIoManager.java | 8 +- .../processors/cache/GridCacheTtlManager.java | 168 +++++++++----- .../processors/cache/GridCacheUtils.java | 5 +- .../apache/ignite/lang/IgniteAsyncSupport.java | 4 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 4 - .../spi/discovery/tcp/TcpDiscoverySpi.java | 4 - .../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +- .../IgniteCacheEntryListenerAbstractTest.java | 4 +- ...CacheLoadingConcurrentGridStartSelfTest.java | 154 +++++++++++++ ...GridCacheLoadingConcurrentGridStartTest.java | 154 ------------- .../tcp/TcpClientDiscoverySelfTest.java | 8 + .../ignite/testsuites/IgniteCacheTestSuite.java | 2 +- modules/schema-import/pom.xml | 6 +- pom.xml | 227 ++++++++++++++++--- 23 files changed, 625 insertions(+), 340 deletions(-) ----------------------------------------------------------------------