Merge branch 'ignite-784' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-784
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/228d16d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/228d16d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/228d16d4
Branch: refs/heads/ignite-784
Commit: 228d16d4b01f9ce315e152f63c1918a2b2f38728
Parents: c718fad b0a32a1
Author: ivasilinets <ivasilin...@gridgain.com>
Authored: Thu Apr 23 12:11:16 2015 +0300
Committer: ivasilinets <ivasilin...@gridgain.com>
Committed: Thu Apr 23 12:11:16 2015 +0300
----------------------------------------------------------------------
.../cache/distributed/near/GridNearCacheEntry.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
