You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/06/01 19:24:36 UTC

[45/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-840' into ignite-sprint-5

Merge remote-tracking branch 'remotes/origin/ignite-840' into ignite-sprint-5


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

Branch: refs/heads/ignite-218
Commit: 9a16d1906b74e918a377cd9d5da6d96c8aeeaaad
Parents: 00848cc 9f9a631
Author: sboikov <sb...@gridgain.com>
Authored: Mon Jun 1 12:45:01 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Jun 1 12:45:01 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheEntryEx.java    | 6 ++++++
 .../ignite/internal/processors/cache/GridCacheMapEntry.java   | 5 +++++
 .../cache/distributed/GridDistributedCacheEntry.java          | 7 -------
 .../processors/cache/distributed/dht/GridDhtCacheEntry.java   | 6 +-----
 .../internal/processors/datastreamer/DataStreamerImpl.java    | 2 ++
 .../internal/processors/cache/GridCacheTestEntryEx.java       | 4 ++++
 .../datastreamer/DataStreamerMultiThreadedSelfTest.java       | 2 --
 7 files changed, 18 insertions(+), 14 deletions(-)
----------------------------------------------------------------------