Merge branch 'ignite-sprint-3' into ignite-661

Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/47c4b175
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/47c4b175
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/47c4b175

Branch: refs/heads/ignite-661
Commit: 47c4b175962b6f4c48690bb945491229b4215bbb
Parents: a3738dd 6e84a3b
Author: vozerov-gridgain <voze...@gridgain.com>
Authored: Thu Apr 9 11:09:22 2015 +0300
Committer: vozerov-gridgain <voze...@gridgain.com>
Committed: Thu Apr 9 11:09:22 2015 +0300

----------------------------------------------------------------------
 .../examples/datagrid/CacheAffinityExample.java |   9 +-
 .../examples/datagrid/CacheApiExample.java      |   9 +-
 .../examples/datagrid/CacheAsyncApiExample.java |   9 +-
 .../datagrid/CacheContinuousQueryExample.java   |   8 +-
 .../datagrid/CacheDataStreamerExample.java      |   9 +-
 .../examples/datagrid/CacheEventsExample.java   |   9 +-
 .../examples/datagrid/CachePutGetExample.java   |  10 +-
 .../datagrid/CacheTransactionExample.java       |   8 +-
 .../hibernate/HibernateL2CacheExample.java      |   5 +-
 .../starschema/CacheStarSchemaExample.java      |  10 +-
 .../store/auto/CacheAutoStoreExample.java       |   8 +-
 .../auto/CacheAutoStoreLoadDataExample.java     |   5 +-
 .../datagrid/store/auto/CacheConfig.java        |   4 +-
 .../store/dummy/CacheDummyStoreExample.java     |   5 +-
 .../hibernate/CacheHibernateStoreExample.java   |   5 +-
 .../store/jdbc/CacheJdbcStoreExample.java       |   5 +-
 .../streaming/StreamVisitorExample.java         |   5 +-
 .../src/main/java/org/apache/ignite/Ignite.java |  11 +
 .../java/org/apache/ignite/IgniteCluster.java   |   9 +-
 .../ignite/cluster/ClusterStartNodeResult.java  |  46 +
 .../ignite/internal/ClusterMetricsSnapshot.java | 384 +++-----
 .../apache/ignite/internal/IgniteKernal.java    |  19 +-
 .../cluster/ClusterStartNodeResultImpl.java     |  87 ++
 .../cluster/IgniteClusterAsyncImpl.java         |   5 +-
 .../internal/cluster/IgniteClusterImpl.java     |  37 +-
 .../cache/DynamicCacheChangeRequest.java        |   2 +-
 .../processors/cache/GridCacheProcessor.java    | 119 +--
 .../util/nodestart/IgniteNodeCallable.java      |  30 -
 .../util/nodestart/IgniteSshHelper.java         |   2 +-
 .../util/nodestart/StartNodeCallable.java       |  30 +
 .../messages/TcpDiscoveryAbstractMessage.java   |  24 +-
 .../messages/TcpDiscoveryAuthFailedMessage.java |  25 +-
 .../TcpDiscoveryCheckFailedMessage.java         |  24 +-
 .../TcpDiscoveryClientReconnectMessage.java     |  30 +-
 .../TcpDiscoveryCustomEventMessage.java         |  23 +-
 .../messages/TcpDiscoveryDiscardMessage.java    |  24 +-
 .../TcpDiscoveryDuplicateIdMessage.java         |  24 +-
 .../messages/TcpDiscoveryHandshakeRequest.java  |   8 -
 .../messages/TcpDiscoveryHandshakeResponse.java |  22 -
 .../messages/TcpDiscoveryHeartbeatMessage.java  |  44 +-
 .../TcpDiscoveryJoinRequestMessage.java         |  28 +-
 .../TcpDiscoveryLoopbackProblemMessage.java     |  28 +-
 .../TcpDiscoveryNodeAddFinishedMessage.java     |  24 +-
 .../messages/TcpDiscoveryNodeAddedMessage.java  |  60 +-
 .../messages/TcpDiscoveryNodeFailedMessage.java |  28 +-
 .../messages/TcpDiscoveryNodeLeftMessage.java   |   8 -
 .../tcp/messages/TcpDiscoveryPingRequest.java   |  25 +-
 .../tcp/messages/TcpDiscoveryPingResponse.java  |  14 -
 .../TcpDiscoveryStatusCheckMessage.java         |  30 +-
 ...teCacheConfigurationDefaultTemplateTest.java | 111 +++
 ...eCacheConfigurationTemplateNotFoundTest.java | 114 ---
 .../IgniteCacheConfigurationTemplateTest.java   |  86 +-
 .../ignite/testframework/junits/IgniteMock.java |   5 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |   2 +-
 .../h2/sql/AbstractH2CompareQueryTest.java      | 341 ++++++++
 .../query/h2/sql/BaseH2CompareQueryTest.java    | 823 +++++++++++++++++
 .../query/h2/sql/H2CompareBigQueryTest.java     | 707 +++++++++++++++
 .../query/h2/sql/IgniteVsH2QueryTest.java       | 875 -------------------
 .../IgniteCacheQuerySelfTestSuite.java          |   5 +-
 .../processors/query/h2/sql/bigQuery.sql        |  55 ++
 .../org/apache/ignite/IgniteSpringBean.java     |   7 +
 .../util/nodestart/IgniteNodeCallableImpl.java  | 308 -------
 .../util/nodestart/IgniteSshHelperImpl.java     |   4 +-
 .../util/nodestart/StartNodeCallableImpl.java   | 309 +++++++
 ...gniteProjectionStartStopRestartSelfTest.java | 261 +++---
 .../IgniteStartStopRestartTestSuite.java        |   1 +
 .../commands/start/VisorStartCommand.scala      |   4 +-
 67 files changed, 3054 insertions(+), 2361 deletions(-)
----------------------------------------------------------------------


Reply via email to