Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-239
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d1b9436a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d1b9436a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d1b9436a Branch: refs/heads/ignite-141 Commit: d1b9436a467148539d69a6dc70a084dd37ffa58f Parents: 4f7dbf7 e1c0945 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Feb 27 17:59:43 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Feb 27 17:59:43 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 - 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 +- 36 files changed, 358 insertions(+), 1694 deletions(-) ----------------------------------------------------------------------
