ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [14/48] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-297
Date Thu, 19 Feb 2015 18:43:36 GMT
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-297


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

Branch: refs/heads/ignite-292
Commit: 9c1bbc1ebe61b45e806eb6df52b988117f12021c
Parents: b1531c0 ee38639
Author: sboikov <semen.boikov@inria.fr>
Authored: Wed Feb 18 20:00:56 2015 +0300
Committer: sboikov <semen.boikov@inria.fr>
Committed: Wed Feb 18 20:00:56 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/GridComponent.java   |   4 +-
 .../ignite/internal/GridPluginComponent.java    |   2 +-
 .../internal/managers/GridManagerAdapter.java   |   2 +-
 .../discovery/GridDiscoveryManager.java         |   4 +-
 .../processors/GridProcessorAdapter.java        |   2 +-
 .../processors/cache/GridCacheSwapManager.java  |  84 +++++++-------
 .../distributed/dht/GridDhtCacheEntry.java      | 112 ++++++++++++-------
 .../continuous/GridContinuousProcessor.java     |   2 +-
 .../plugin/IgnitePluginProcessor.java           |   4 +-
 .../apache/ignite/plugin/PluginProvider.java    |   3 +-
 .../spi/discovery/DiscoverySpiDataExchange.java |   3 +-
 .../discovery/tcp/TcpClientDiscoverySpi.java    |   4 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |   4 +-
 .../discovery/AbstractDiscoverySelfTest.java    |   4 +-
 .../tcp/TcpDiscoverySpiStartStopSelfTest.java   |   2 +-
 .../junits/spi/GridSpiAbstractTest.java         |   2 +-
 16 files changed, 137 insertions(+), 101 deletions(-)
----------------------------------------------------------------------



Mime
View raw message