You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/09/15 15:41:00 UTC

[09/10] ignite git commit: Merge branch 'master' into ignite-1282

Merge branch 'master' into ignite-1282


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

Branch: refs/heads/ignite-gg-10760
Commit: 25c9f609e81880704d51f710ef22b33a925ac47b
Parents: d6f69c9 6e48c9c
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 15 16:40:30 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 15 16:40:30 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheProcessor.java    |  10 +-
 .../dht/GridClientPartitionTopology.java        | 104 +++++++++++--------
 .../dht/GridDhtPartitionTopology.java           |   4 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |   7 +-
 .../cache/transactions/IgniteTxHandler.java     |   2 +-
 .../ignite/internal/util/IgniteUtils.java       |  16 +++
 .../processors/igfs/IgfsAbstractSelfTest.java   |   3 +-
 7 files changed, 90 insertions(+), 56 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/25c9f609/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------