Merge remote-tracking branch 'origin/sprint-1' into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/56b4afd3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/56b4afd3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/56b4afd3 Branch: refs/heads/ignite-238 Commit: 56b4afd3e5471948b23a1ba9cbba1da02202e103 Parents: 298b0ce a66a89d Author: vozerov-gridgain <voze...@gridgain.com> Authored: Fri Feb 13 14:12:14 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Fri Feb 13 14:12:14 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/events/EventType.java | 2 - .../managers/deployment/GridDeployment.java | 3 - .../deployment/GridDeploymentManager.java | 3 - .../GridDeploymentPerLoaderStore.java | 3 - .../GridDeploymentPerVersionStore.java | 3 - .../processors/cache/GridCacheProcessor.java | 2 +- .../distributed/GridDistributedCacheEntry.java | 3 - .../distributed/dht/GridDhtCacheEntry.java | 3 - .../dht/atomic/GridDhtAtomicCacheEntry.java | 3 - .../colocated/GridDhtColocatedCacheEntry.java | 3 - .../distributed/near/GridNearCacheEntry.java | 3 - .../cache/local/GridLocalCacheEntry.java | 3 - .../cache/query/GridCacheQueryManager.java | 3 - .../cache/transactions/IgniteTxAdapter.java | 3 - .../shmem/IpcSharedMemoryServerEndpoint.java | 7 +-- .../util/lang/GridMetadataAwareAdapter.java | 3 - .../ignite/internal/visor/cache/VisorCache.java | 51 ---------------- .../visor/cache/VisorCacheConfiguration.java | 62 +++++++++++++++++++- .../visor/cache/VisorCacheTypeMetadata.java | 16 +++++ .../visor/node/VisorGridConfiguration.java | 2 +- .../apache/ignite/logger/java/JavaLogger.java | 3 - .../communication/tcp/TcpCommunicationSpi.java | 3 +- .../junits/logger/GridTestLog4jLogger.java | 3 - .../fs/hadoop/GridGgfsHadoopJclLogger.java | 3 - .../GridHadoopExternalCommunication.java | 3 +- .../ignite/logger/jcl/IgniteJclLogger.java | 3 - .../apache/ignite/logger/log4j/Log4JLogger.java | 6 +- .../processors/schedule/ScheduleFutureImpl.java | 3 - .../ignite/logger/slf4j/GridSlf4jLogger.java | 3 - 29 files changed, 82 insertions(+), 129 deletions(-) ----------------------------------------------------------------------
