ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vkuliche...@apache.org
Subject [6/6] incubator-ignite git commit: Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-141
Date Sat, 28 Feb 2015 03:48:24 GMT
Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-141


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

Branch: refs/heads/ignite-141
Commit: 6653e55e502a001d3fad8f2776c38550bc056580
Parents: 61908d6 a792c99
Author: Valentin Kulichenko <vkulichenko@gridgain.com>
Authored: Fri Feb 27 19:35:35 2015 -0800
Committer: Valentin Kulichenko <vkulichenko@gridgain.com>
Committed: Fri Feb 27 19:35:35 2015 -0800

----------------------------------------------------------------------
 config/hadoop/default-config.xml                |  12 +
 config/ignite-log4j.xml                         |   2 +-
 .../datagrid/CacheContinuousQueryExample.java   |   2 +-
 ipc/shmem/Makefile.am                           |  15 +
 ipc/shmem/igniteshmem/Makefile.am               |  15 +
 ipc/shmem/include/Makefile.am                   |  15 +
 modules/clients/src/test/keystore/generate.sh   |  15 +-
 .../src/main/java/org/apache/ignite/Ignite.java |   4 +-
 .../ignite/cache/query/ContinuousQuery.java     |  18 +-
 .../apache/ignite/cluster/ClusterMetrics.java   |   2 +-
 .../configuration/QueryConfiguration.java       |  37 +-
 .../java/org/apache/ignite/igfs/IgfsMode.java   |   6 +-
 .../apache/ignite/internal/GridProperties.java  |  78 ----
 .../ignite/internal/GridUpdateNotifier.java     |   2 +-
 .../apache/ignite/internal/IgniteKernal.java    |  18 +-
 .../ignite/internal/IgniteProperties.java       |  79 ++++
 .../ignite/internal/IgniteVersionUtils.java     |   8 +-
 .../internal/events/DiscoveryCustomEvent.java   |   3 +
 .../processors/cache/IgniteCacheProxy.java      |   6 +-
 .../plugin/IgnitePluginProcessor.java           |  24 ++
 .../visor/node/VisorBasicConfiguration.java     |  17 -
 .../apache/ignite/plugin/PluginProvider.java    |   5 +
 .../TcpDiscoveryCustomEventMessage.java         |   3 +
 .../internal/GridUpdateNotifierSelfTest.java    |   2 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |   8 +-
 .../config/GridTestProperties.java              |  10 +-
 modules/extdata/p2p/pom.xml                     |   6 -
 .../client/hadoop/GridHadoopClientProtocol.java |   6 +-
 .../hadoop/IgfsHadoopFileSystemWrapper.java     | 412 ++++++++++++++++++
 .../igfs/hadoop/v1/IgfsHadoopFileSystem.java    |   3 +-
 .../igfs/hadoop/v2/IgfsHadoopFileSystem.java    |   3 +-
 .../igfs/hadoop/IgfsHadoopFSProperties.java     |  10 +-
 .../hadoop/IgfsHadoopFileSystemWrapper.java     | 413 -------------------
 .../internal/igfs/hadoop/IgfsHadoopReader.java  |   2 +-
 .../internal/igfs/hadoop/IgfsHadoopUtils.java   |   4 +-
 .../hadoop/GridHadoopClassLoader.java           |  12 +-
 .../processors/hadoop/GridHadoopSetup.java      |   8 +-
 .../processors/hadoop/GridHadoopUtils.java      |   4 +-
 .../collections/GridHadoopHashMultimapBase.java |   2 +-
 .../GridHadoopExternalCommunication.java        |  14 +-
 .../hadoop/v1/GridHadoopV1MapTask.java          |   6 +-
 .../v2/GridHadoopV2JobResourceManager.java      |   2 +-
 .../GridHadoopClientProtocolSelfTest.java       |   6 +-
 .../apache/ignite/igfs/IgfsEventsTestSuite.java |   2 +-
 .../IgfsHadoop20FileSystemAbstractSelfTest.java |   2 +-
 .../igfs/IgfsHadoopDualAbstractSelfTest.java    |   2 +-
 .../IgfsHadoopFileSystemAbstractSelfTest.java   |   1 +
 ...fsHadoopFileSystemSecondaryModeSelfTest.java |   2 +-
 .../hadoop/GridHadoopGroupingTest.java          |   4 +-
 .../igfs/IgfsPerformanceBenchmark.java          |   9 +-
 modules/hibernate/pom.xml                       |   6 -
 .../HibernateReadWriteAccessStrategy.java       |  81 +++-
 modules/indexing/pom.xml                        |   6 -
 modules/jta/pom.xml                             |   6 -
 modules/scalar/pom.xml                          |   6 -
 modules/spring/pom.xml                          |   6 -
 modules/visor-console/pom.xml                   |   7 -
 .../commands/alert/VisorAlertCommand.scala      |   8 +-
 .../commands/cache/VisorCacheCommand.scala      |  82 ++--
 .../config/VisorConfigurationCommand.scala      | 140 ++++---
 .../commands/disco/VisorDiscoveryCommand.scala  |   2 +-
 .../scala/org/apache/ignite/visor/visor.scala   |  64 ++-
 .../commands/tasks/VisorTasksCommandSpec.scala  |   2 +-
 modules/web/pom.xml                             |   6 -
 modules/winservice/IgniteService.sln            |   2 +-
 .../IgniteService/IgniteService.csproj          |   2 +-
 .../config/benchmark-atomic-win.properties      |  15 +
 .../config/benchmark-atomic.properties          |  15 +
 .../config/benchmark-compute-win.properties     |  15 +
 .../config/benchmark-compute.properties         |  15 +
 .../config/benchmark-multicast.properties       |  15 +
 .../config/benchmark-query-win.properties       |  15 +
 .../yardstick/config/benchmark-query.properties |  15 +
 .../config/benchmark-tx-win.properties          |  15 +
 .../yardstick/config/benchmark-tx.properties    |  15 +
 .../yardstick/config/benchmark-win.properties   |  15 +
 modules/yardstick/config/benchmark.properties   |  15 +
 pom.xml                                         | 150 +++----
 78 files changed, 1217 insertions(+), 865 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6653e55e/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------


Mime
View raw message