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/ignite-45
Commit: 0d70de861e9f9beb8bc237ce81909efccd18866c
Parents: e50d1ea f053746
Author: ivasilinets <ivasilin...@gridgain.com>
Authored: Fri Feb 27 18:28:17 2015 +0300
Committer: ivasilinets <ivasilin...@gridgain.com>
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
----------------------------------------------------------------------
