You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/05/26 12:19:37 UTC

[2/2] incubator-ignite git commit: Merge branch 'ignite-471-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-471-2

Merge branch 'ignite-471-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-471-2


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

Branch: refs/heads/ignite-471-2
Commit: 48afb862dca22b7ef7f6fc9673173f7ecc664ef8
Parents: 099ef55 df808af
Author: Denis Magda <dm...@gridgain.com>
Authored: Tue May 26 13:19:20 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue May 26 13:19:20 2015 +0300

----------------------------------------------------------------------
 dev-tools/slurp.sh                              |   8 -
 dev-tools/src/main/groovy/jiraslurp.groovy      | 186 ++++++++++++-------
 .../processors/cache/GridCacheProcessor.java    |   4 +-
 .../processors/cache/IgniteCacheProxy.java      |   3 +-
 .../GridDistributedTxRemoteAdapter.java         |  10 +-
 .../cacheobject/IgniteCacheObjectProcessor.java |   6 +-
 .../datastreamer/DataStreamerImpl.java          |   5 +-
 .../portable/GridPortableInputStream.java       |   1 -
 .../processors/query/GridQueryIndexing.java     |  16 ++
 .../processors/query/GridQueryProcessor.java    |  52 ++----
 .../internal/GridDiscoveryEventSelfTest.java    |  14 +-
 ...ridFailFastNodeFailureDetectionSelfTest.java |   6 +-
 .../GridDiscoveryManagerAliveCacheSelfTest.java |   3 +-
 .../cache/GridCacheMemoryModeSelfTest.java      |   3 +
 ...cheAtomicReferenceMultiNodeAbstractTest.java |   8 -
 .../GridCacheSwapScanQueryAbstractSelfTest.java |   5 +-
 .../DataStreamProcessorSelfTest.java            |   8 +-
 .../internal/util/nio/GridNioSelfTest.java      |  12 +-
 .../internal/util/nio/GridNioSslSelfTest.java   |   1 +
 .../tostring/GridToStringBuilderSelfTest.java   |   8 +-
 .../ignite/messaging/GridMessagingSelfTest.java |   8 +-
 .../GridP2PContinuousDeploymentSelfTest.java    |   5 +-
 .../ignite/testframework/GridTestUtils.java     |   2 +-
 .../junits/IgniteTestResources.java             |   1 +
 .../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 +
 .../query/h2/sql/GridQueryParsingTest.java      |   2 +-
 .../visor/commands/node/VisorNodeCommand.scala  |   2 +-
 .../commands/tasks/VisorTasksCommand.scala      |   2 +-
 .../scala/org/apache/ignite/visor/visor.scala   |  63 ++++++-
 pom.xml                                         |  11 ++
 37 files changed, 342 insertions(+), 184 deletions(-)
----------------------------------------------------------------------