Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-201

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

Branch: refs/heads/ignite-176
Commit: d8ae54ced82ecbbd45465d0dd422ac6bd9ed55bb
Parents: a0e1772 148753c
Author: ivasilinets <ivasilin...@gridgain.com>
Authored: Mon Feb 9 16:11:31 2015 +0300
Committer: ivasilinets <ivasilin...@gridgain.com>
Committed: Mon Feb 9 16:11:31 2015 +0300

----------------------------------------------------------------------
 bin/ignite-schema-load.bat                      |    2 +-
 bin/ignite-schema-load.sh                       |    2 +-
 .../JettyRestProcessorAbstractSelfTest.java     |    2 +-
 .../cache/query/QueryAffinityPredicate.java     |    3 +
 .../cache/query/QueryContinuousPredicate.java   |    3 +
 .../ignite/cache/query/QuerySqlPredicate.java   |    3 +
 .../ignite/cache/query/QueryTextPredicate.java  |    3 +
 .../client/impl/GridClientThreadFactory.java    |    2 +-
 .../configuration/TransactionConfiguration.java |    3 +
 .../apache/ignite/internal/GridDiagnostic.java  |    2 +-
 .../apache/ignite/internal/GridProperties.java  |    4 -
 .../org/apache/ignite/internal/IgnitionEx.java  |    2 +-
 .../cache/CacheStorePartialUpdateException.java |    3 +
 .../cache/CacheWeakQueryIteratorsHolder.java    |    3 +
 .../processors/cache/GridCacheAdapter.java      |   12 +
 .../processors/cache/GridCacheMapEntry.java     |    2 +-
 .../processors/cache/IgniteCacheProxy.java      |    2 +-
 .../distributed/GridCacheTtlUpdateRequest.java  |    3 +
 .../cache/query/GridCacheSqlQuery.java          |    3 +
 .../cache/query/GridCacheTwoStepQuery.java      |    3 +
 .../cache/transactions/IgniteTxKey.java         |    3 +
 .../transactions/IgniteTxMetricsAdapter.java    |    3 +
 .../closure/GridClosureProcessor.java           |   15 +
 .../internal/processors/fs/GridGgfsImpl.java    |    8 +-
 .../hadoop/GridHadoopJobProperty.java           |    2 +-
 .../ignite/internal/util/IgniteUtils.java       |   26 +-
 .../internal/util/future/IgniteFutureImpl.java  |    3 +
 .../util/portscanner/GridJmxPortFinder.java     |    2 +-
 .../optimized/optimized-classnames.properties   | 1657 ++++++++++++++++++
 .../jobstealing/JobStealingCollisionSpi.java    |   16 +-
 .../WeightedRandomLoadBalancingSpi.java         |    4 +-
 ...eJdbcStoreAbstractMultithreadedSelfTest.java |    9 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |   31 +-
 .../GridCacheAbstractIteratorsSelfTest.java     |    2 -
 ...acheEntrySetIterationPreloadingSelfTest.java |    3 +-
 ...tomicClientOnlyMultiNodeFullApiSelfTest.java |    3 +-
 ...achePartitionedMultiNodeFullApiSelfTest.java |   18 +-
 .../local/GridCacheLocalIteratorsSelfTest.java  |   80 -
 .../processors/fs/GridGgfsAbstractSelfTest.java |    6 +-
 .../fs/GridGgfsDualAbstractSelfTest.java        |    2 +-
 .../processors/fs/GridGgfsModesSelfTest.java    |  136 +-
 .../GridServiceReassignmentSelfTest.java        |   17 +-
 .../ignite/testframework/GridTestUtils.java     |    2 +-
 .../src/test/resources/load/html/index.html     |  958 ----------
 .../resources/load/js/gg-loadtest-server.js     |   96 -
 .../client/hadoop/GridHadoopClientProtocol.java |    4 +-
 .../processors/hadoop/GridHadoopSetup.java      |    2 +-
 .../processors/hadoop/GridHadoopUtils.java      |    8 +-
 .../counter/GridHadoopFSCounterWriter.java      |    2 +-
 .../hadoop/GridHadoopPopularWordsTest.java      |    4 +-
 .../processors/hadoop/GridHadoopStartup.java    |    2 +-
 .../h2/twostep/GridReduceQueryExecutor.java     |    3 +
 .../twostep/messages/GridNextPageRequest.java   |    3 +
 .../twostep/messages/GridNextPageResponse.java  |    3 +
 .../query/h2/twostep/messages/GridQueryAck.java |    3 +
 .../twostep/messages/GridQueryFailResponse.java |    3 +
 .../h2/twostep/messages/GridQueryRequest.java   |    3 +
 .../http/jetty/GridJettyRestHandler.java        |    6 +-
 .../rest/protocols/http/jetty/rest.html         |    4 +-
 .../apache/ignite/schema/ui/SchemaLoadApp.java  |  245 ++-
 .../ignite/internal/GridFactorySelfTest.java    |    2 +-
 .../yardstick/config/benchmark-store.properties |    2 +-
 .../jdbc/IgniteJdbcStoreAbstractBenchmark.java  |    2 +
 pom.xml                                         |   50 +-
 64 files changed, 2145 insertions(+), 1370 deletions(-)
----------------------------------------------------------------------


Reply via email to