Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-929


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

Branch: refs/heads/ignite-929
Commit: 3992a38793c9a94e3625e5aa370126c7dfa49cde
Parents: 71b81e0 c75caba
Author: avinogradov <avinogra...@gridgain.com>
Authored: Tue May 26 20:09:14 2015 +0300
Committer: avinogradov <avinogra...@gridgain.com>
Committed: Tue May 26 20:09:14 2015 +0300

----------------------------------------------------------------------
 dev-tools/slurp.sh                              |   8 -
 dev-tools/src/main/groovy/jiraslurp.groovy      | 222 ++++++++++++-------
 .../ClientAbstractConnectivitySelfTest.java     |  14 ++
 .../internal/interop/InteropException.java      |   6 +
 .../interop/InteropNoCallbackException.java     |  50 +++++
 .../processors/cache/IgniteCacheProxy.java      |   3 +-
 .../GridDistributedTxRemoteAdapter.java         |  10 +-
 .../processors/query/GridQueryIndexing.java     |  16 ++
 .../processors/query/GridQueryProcessor.java    |  52 ++---
 .../ignite/internal/util/IgniteUtils.java       |   6 +-
 .../query/h2/GridH2IndexingGeoSelfTest.java     |  20 +-
 .../processors/query/h2/IgniteH2Indexing.java   |  17 ++
 .../query/h2/opt/GridH2AbstractKeyValueRow.java |  18 +-
 .../query/h2/opt/GridH2KeyValueRowOffheap.java  |   4 +-
 .../query/h2/sql/GridSqlOperationType.java      |   2 +-
 .../h2/twostep/GridReduceQueryExecutor.java     |   2 +-
 .../IgniteCacheQueryMultiThreadedSelfTest.java  |   2 +-
 .../local/IgniteCacheLocalQuerySelfTest.java    |   6 +
 .../visor/commands/node/VisorNodeCommand.scala  |   2 +-
 .../commands/tasks/VisorTasksCommand.scala      |   2 +-
 .../scala/org/apache/ignite/visor/visor.scala   |  63 +++++-
 pom.xml                                         |  11 +
 22 files changed, 389 insertions(+), 147 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3992a387/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------

Reply via email to