Merge remote-tracking branch 'origin/ignite-187' into ignite-187
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0c9ada09 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0c9ada09 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0c9ada09 Branch: refs/heads/ignite-143 Commit: 0c9ada090d272fd5ad9023bdc2bf854cfbdc9db0 Parents: 482094b 57fc321 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Wed Mar 4 10:13:57 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Wed Mar 4 10:13:57 2015 +0300 ---------------------------------------------------------------------- .../spi/checkpoint/s3/S3CheckpointSpi.java | 2 +- modules/clients/readme.md | 4 +- modules/clients/readme.pdf | Bin 52230 -> 47887 bytes .../integration/ClientAbstractSelfTest.java | 3 - .../java/org/apache/ignite/IgniteEvents.java | 2 +- .../apache/ignite/cache/store/CacheStore.java | 49 - .../cache/store/jdbc/CacheJdbcBlobStore.java | 2 +- .../apache/ignite/internal/GridDiagnostic.java | 15 +- .../ignite/internal/GridUpdateNotifier.java | 8 +- .../apache/ignite/internal/IgniteKernal.java | 23 +- .../internal/managers/GridManagerAdapter.java | 59 +- .../checkpoint/GridCheckpointManager.java | 2 - .../collision/GridCollisionManager.java | 2 - .../managers/communication/GridIoManager.java | 2 - .../deployment/GridDeploymentManager.java | 2 - .../discovery/GridDiscoveryManager.java | 2 - .../eventstorage/GridEventStorageManager.java | 2 - .../managers/failover/GridFailoverManager.java | 2 - .../managers/indexing/GridIndexingManager.java | 2 - .../loadbalancer/GridLoadBalancerManager.java | 2 - .../swapspace/GridSwapSpaceManager.java | 2 - .../internal/processors/GridProcessor.java | 3 - .../apache/ignite/marshaller/Marshaller.java | 2 +- .../ignite/marshaller/jdk/JdkMarshaller.java | 2 +- .../optimized/OptimizedMarshaller.java | 2 +- .../SpringApplicationContextResource.java | 2 +- .../checkpoint/cache/CacheCheckpointSpi.java | 2 +- .../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 2 +- .../sharedfs/SharedFsCheckpointSpi.java | 2 +- .../jobstealing/JobStealingCollisionSpi.java | 4 +- .../PriorityQueueCollisionSpi.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 16 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../memory/MemoryEventStorageSpi.java | 2 +- .../spi/failover/always/AlwaysFailoverSpi.java | 2 +- .../jobstealing/JobStealingFailoverSpi.java | 2 +- .../spi/failover/never/NeverFailoverSpi.java | 2 +- .../apache/ignite/spi/indexing/IndexingSpi.java | 2 +- .../adaptive/AdaptiveLoadBalancingSpi.java | 2 +- .../roundrobin/RoundRobinLoadBalancingSpi.java | 2 +- .../WeightedRandomLoadBalancingSpi.java | 2 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 2 +- .../startup/cmdline/CommandLineStartup.java | 4 +- .../startup/cmdline/ggcube_node_128x128.png | Bin 4679 -> 0 bytes .../startup/cmdline/ggcube_node_48x48.png | Bin 2355 -> 0 bytes .../startup/cmdline/logo_ignite_128x128.png | Bin 0 -> 18667 bytes .../startup/cmdline/logo_ignite_48x48.png | Bin 0 -> 16572 bytes .../internal/GridUpdateNotifierSelfTest.java | 2 +- .../core/src/test/resources/log/ignite.log.tst | 13706 ----------------- .../hibernate/CacheHibernateBlobStore.java | 2 +- .../rest/protocols/http/jetty/rest.html | 19 +- .../spi/deployment/uri/UriDeploymentSpi.java | 2 +- .../ignite/visor/commands/VisorConsole.scala | 16 +- .../ignite/visor/commands/ggcube_128x128.png | Bin 11444 -> 0 bytes .../ignite/visor/commands/ggcube_48x48.png | Bin 3365 -> 0 bytes .../visor/commands/logo_ignite_128x128.png | Bin 0 -> 18667 bytes .../ignite/visor/commands/logo_ignite_48x48.png | Bin 0 -> 16572 bytes pom.xml | 1 - 58 files changed, 85 insertions(+), 13913 deletions(-) ----------------------------------------------------------------------
