ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yzhda...@apache.org
Subject [50/50] [abbrv] incubator-ignite git commit: Merge branches 'ignite-96' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-96
Date Thu, 12 Feb 2015 13:51:27 GMT
Merge branches 'ignite-96' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-96

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java
	modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java


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

Branch: refs/heads/ignite-96
Commit: 080c68f44097c7dc309a8c7fd04110a6cbc8bb1a
Parents: 18d4ab4 c049edb
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Thu Feb 12 16:50:26 2015 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Thu Feb 12 16:50:26 2015 +0300

----------------------------------------------------------------------
 assembly/dependencies-optional-fabric.xml       |   1 +
 assembly/dependencies-optional-hadoop.xml       |   2 +-
 assembly/dependencies-schema-load.xml           |   2 +-
 assembly/dependencies-visor-trial.xml           |  80 -------
 assembly/release-base-fabric.xml                |  83 --------
 assembly/release-base.xml                       |   2 +
 assembly/release-fabric.xml                     |  59 +++++-
 assembly/release-scala.xml                      |  50 +++++
 examples/pom-standalone.xml                     |  83 ++++----
 examples/pom.xml                                |  79 ++++---
 modules/core/pom.xml                            |  81 +++++++
 .../src/main/java/org/apache/ignite/Ignite.java |   9 +-
 .../ignite/internal/GridKernalContext.java      |  23 --
 .../ignite/internal/GridKernalContextImpl.java  |  34 +--
 .../ignite/internal/GridPluginComponent.java    |   2 -
 .../apache/ignite/internal/GridProductImpl.java | 198 -----------------
 .../apache/ignite/internal/GridProperties.java  |   2 +-
 .../ignite/internal/GridUpdateNotifier.java     |  15 --
 .../org/apache/ignite/internal/IgniteEx.java    |  12 +-
 .../apache/ignite/internal/IgniteKernal.java    | 212 ++++---------------
 .../ignite/internal/IgniteVersionUtils.java     |  78 +++++++
 .../impl/GridRouterCommandLineStartup.java      |   4 +-
 .../processors/cache/CacheInvokeEntry.java      |  38 +++-
 .../processors/cache/EvictableEntryImpl.java    |   2 +
 .../processors/cache/GridCacheContext.java      |  13 ++
 .../cache/GridCacheEvictionManager.java         |   4 +-
 .../processors/cache/GridCacheIoManager.java    |  74 ++-----
 .../GridCachePartitionExchangeManager.java      |   5 +-
 .../processors/cache/GridCacheSwapManager.java  |   4 -
 .../processors/cache/IgniteCacheProxy.java      |   6 +-
 ...ridCacheOptimisticCheckPreparedTxFuture.java |   8 +-
 ...idCacheOptimisticCheckPreparedTxRequest.java |  30 ++-
 ...dCachePessimisticCheckCommittedTxFuture.java |   2 +-
 ...CachePessimisticCheckCommittedTxRequest.java |  27 +++
 ...achePessimisticCheckCommittedTxResponse.java |  29 ++-
 .../GridDistributedCacheAdapter.java            |   3 +
 .../distributed/dht/GridDhtCacheAdapter.java    |   4 +-
 .../distributed/dht/GridDhtLockFuture.java      |   5 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |   8 +-
 .../distributed/dht/GridDhtTxFinishFuture.java  |   4 +-
 .../cache/distributed/dht/GridDhtTxLocal.java   |   2 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |   9 +-
 .../dht/GridPartitionedGetFuture.java           |   2 +-
 .../dht/atomic/GridDhtAtomicCache.java          |   6 +-
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |   2 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   4 +-
 .../dht/colocated/GridDhtColocatedCache.java    |   4 +-
 .../colocated/GridDhtColocatedLockFuture.java   |   5 +-
 .../dht/preloader/GridDhtForceKeysFuture.java   |   2 +-
 .../preloader/GridDhtPartitionDemandPool.java   |   2 +-
 .../preloader/GridDhtPartitionSupplyPool.java   |  20 +-
 .../GridDhtPartitionsExchangeFuture.java        |   8 +-
 .../dht/preloader/GridDhtPreloader.java         |   2 +-
 .../distributed/near/GridNearGetFuture.java     |   2 +-
 .../distributed/near/GridNearLockFuture.java    |   5 +-
 .../near/GridNearTransactionalCache.java        |   4 +-
 .../near/GridNearTxFinishFuture.java            |   2 +-
 .../near/GridNearTxPrepareFuture.java           |   2 +-
 .../query/GridCacheDistributedQueryFuture.java  |   2 +-
 .../query/GridCacheDistributedQueryManager.java |   4 +-
 .../jdbc/GridCacheQueryJdbcValidationTask.java  |   5 -
 .../cache/transactions/IgniteInternalTx.java    |   6 +
 .../cache/transactions/IgniteTxAdapter.java     |  14 +-
 .../cache/transactions/IgniteTxHandler.java     |  13 +-
 .../processors/fs/GridGgfsDataManager.java      |  16 +-
 .../processors/fs/GridGgfsIpcHandler.java       |  13 +-
 .../internal/processors/fs/GridGgfsServer.java  |   2 +-
 .../processors/fs/IgniteFsProcessor.java        |   5 -
 .../license/GridLicenseProcessor.java           |  69 ------
 .../license/GridLicenseSubsystem.java           |  53 -----
 .../license/GridLicenseUseRegistry.java         |  90 --------
 .../license/os/GridOsLicenseProcessor.java      |  66 ------
 .../internal/processors/license/os/package.html |  24 ---
 .../internal/processors/license/package.html    |  24 ---
 .../processors/rest/GridRestProcessor.java      |   5 +-
 .../handlers/cache/GridCacheCommandHandler.java |   4 -
 .../version/GridVersionCommandHandler.java      |   4 +-
 .../streamer/GridStreamProcessor.java           |   5 -
 .../ignite/internal/product/IgniteProduct.java  |  75 -------
 .../internal/product/IgniteProductLicense.java  | 183 ----------------
 .../product/IgniteProductLicenseException.java  |  70 ------
 .../apache/ignite/internal/product/package.html |  24 ---
 .../ipc/shmem/IpcSharedMemoryNativeLoader.java  |   5 +-
 .../ignite/internal/visor/cache/VisorCache.java |  11 +-
 .../visor/misc/VisorLatestVersionTask.java      |   2 +-
 .../visor/node/VisorNodeDataCollectorTask.java  |   3 +-
 .../optimized/optimized-classnames.properties   |   5 +-
 .../startup/cmdline/CommandLineStartup.java     |   8 +-
 .../core/src/main/resources/ignite.properties   |   1 +
 .../ignite/internal/GridVersionSelfTest.java    |   7 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |  27 ++-
 .../cache/GridCacheAbstractMetricsSelfTest.java |  48 ++++-
 .../cache/IgniteCacheInvokeAbstractTest.java    |   4 +
 ...idCacheAtomicPartitionedMetricsSelfTest.java |   5 -
 ...achePartitionedMultiNodeFullApiSelfTest.java |   2 +
 .../product/GridProductVersionSelfTest.java     |   4 +-
 .../marshaller/GridMarshallerAbstractTest.java  |  24 ---
 .../testframework/junits/GridAbstractTest.java  |   4 -
 .../ignite/testframework/junits/IgniteMock.java |   4 +-
 .../processors/hadoop/GridHadoopSetup.java      |   4 +-
 ...idHadoopDefaultMapReducePlannerSelfTest.java |  10 +-
 modules/scalar/pom.xml                          |  15 --
 .../scala/org/apache/ignite/scalar/scalar.scala |   6 +-
 .../org/apache/ignite/IgniteSpringBean.java     |   7 +-
 .../optimized/OptimizedClassNamesGenerator.java |   2 +-
 modules/visor-console/pom.xml                   |  15 --
 .../ignite/visor/commands/VisorConsole.scala    |  27 ++-
 .../commands/alert/VisorAlertCommand.scala      |   2 +-
 .../config/VisorConfigurationCommand.scala      |  11 +-
 .../commands/deploy/VisorDeployCommand.scala    |  11 +-
 .../commands/disco/VisorDiscoveryCommand.scala  |  21 +-
 .../commands/events/VisorEventsCommand.scala    |  15 +-
 .../visor/commands/node/VisorNodeCommand.scala  |  16 +-
 .../commands/start/VisorStartCommand.scala      |   9 +-
 .../commands/tasks/VisorTasksCommand.scala      |  16 +-
 .../commands/top/VisorTopologyCommand.scala     |  22 +-
 .../visor/commands/vvm/VisorVvmCommand.scala    |  22 +-
 .../scala/org/apache/ignite/visor/visor.scala   |   6 +-
 pom.xml                                         | 162 ++++++++------
 119 files changed, 946 insertions(+), 1853 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/080c68f4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/080c68f4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/080c68f4/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java
----------------------------------------------------------------------


Mime
View raw message