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 04B581086D for ; Tue, 3 Mar 2015 09:01:40 +0000 (UTC) Received: (qmail 86559 invoked by uid 500); 3 Mar 2015 08:55:00 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 86509 invoked by uid 500); 3 Mar 2015 08:55:00 -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 86499 invoked by uid 99); 3 Mar 2015 08:55:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Mar 2015 08:55:00 +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, 03 Mar 2015 08:54:36 +0000 Received: (qmail 83661 invoked by uid 99); 3 Mar 2015 08:54:31 -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, 03 Mar 2015 08:54:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 841CCE1085; Tue, 3 Mar 2015 08:54:31 +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, 03 Mar 2015 08:55:05 -0000 Message-Id: <8801dca317e34d9e9555698669771417@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [35/50] incubator-ignite git commit: Merge branches 'ignite-237' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-237 X-Virus-Checked: Checked by ClamAV on apache.org Merge branches 'ignite-237' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-237 Conflicts: modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0d70de86 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0d70de86 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0d70de86 Branch: refs/heads/sprint-2 Commit: 0d70de861e9f9beb8bc237ce81909efccd18866c Parents: e50d1ea f053746 Author: ivasilinets Authored: Fri Feb 27 18:28:17 2015 +0300 Committer: ivasilinets Committed: Fri Feb 27 18:28:17 2015 +0300 ---------------------------------------------------------------------- config/ignite-log4j.xml | 2 +- .../datagrid/CacheContinuousQueryExample.java | 2 +- ipc/shmem/Makefile.am | 15 + ipc/shmem/igniteshmem/Makefile.am | 15 + ipc/shmem/include/Makefile.am | 15 + modules/clients/src/test/keystore/generate.sh | 15 +- .../ignite/cache/query/ContinuousQuery.java | 18 +- .../apache/ignite/cluster/ClusterMetrics.java | 2 +- .../internal/events/DiscoveryCustomEvent.java | 3 + .../processors/cache/IgniteCacheProxy.java | 6 +- .../optimized-classnames.previous.properties | 15 + .../optimized/optimized-classnames.properties | 1565 +----------------- .../TcpDiscoveryCustomEventMessage.java | 3 + ...ridCacheContinuousQueryAbstractSelfTest.java | 8 +- modules/extdata/p2p/pom.xml | 6 - modules/hibernate/pom.xml | 6 - .../HibernateReadWriteAccessStrategy.java | 81 +- modules/indexing/pom.xml | 6 - modules/jta/pom.xml | 6 - modules/scalar/pom.xml | 6 - modules/spring/pom.xml | 6 - modules/visor-console/pom.xml | 7 - modules/web/pom.xml | 6 - modules/winservice/IgniteService.sln | 2 +- .../IgniteService/IgniteService.csproj | 2 +- .../config/benchmark-atomic-win.properties | 15 + .../config/benchmark-atomic.properties | 15 + .../config/benchmark-compute-win.properties | 15 + .../config/benchmark-compute.properties | 15 + .../config/benchmark-multicast.properties | 15 + .../config/benchmark-query-win.properties | 15 + .../yardstick/config/benchmark-query.properties | 15 + .../config/benchmark-tx-win.properties | 15 + .../yardstick/config/benchmark-tx.properties | 15 + .../yardstick/config/benchmark-win.properties | 15 + modules/yardstick/config/benchmark.properties | 15 + pom.xml | 150 +- 37 files changed, 421 insertions(+), 1712 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0d70de86/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java ----------------------------------------------------------------------