Merge remote-tracking branch 'remotes/origin/sprint-2' into gg-9887

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

Branch: refs/heads/ignite-424
Commit: 45ee8e8e27e6840d0d0cf6b5f8fa572678265f8a
Parents: 3161c3c c72a458
Author: ivasilinets <ivasilin...@gridgain.com>
Authored: Mon Mar 16 17:27:40 2015 +0300
Committer: ivasilinets <ivasilin...@gridgain.com>
Committed: Mon Mar 16 17:27:40 2015 +0300

----------------------------------------------------------------------
 .../ignite/cache/query/SqlFieldsQuery.java      |   7 +
 .../org/apache/ignite/cache/query/SqlQuery.java |   7 +
 .../apache/ignite/cache/query/TextQuery.java    |   7 +
 .../ignite/internal/MarshallerContextImpl.java  |  30 ++-
 .../processors/cache/query/QueryCursorEx.java   |  46 +++++
 .../processors/cache/query/QueryCursorImpl.java |  14 +-
 .../continuous/CacheContinuousQueryHandler.java |   3 +
 .../optimized/OptimizedMarshallerUtils.java     |  16 +-
 .../TcpDiscoveryMulticastIpFinder.java          |   4 +-
 ...acheStoreSessionWriteBehindAbstractTest.java |  16 +-
 .../OptimizedMarshallerNodeFailoverTest.java    | 200 +++++++++++++++++++
 .../IgniteMarshallerSelfTestSuite.java          |   1 +
 .../schema/generator/SnippetGenerator.java      |  10 +-
 13 files changed, 339 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


Reply via email to