[7/7] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-3477' into ignite-4652

2017-02-16 Thread sboikov
Merge remote-tracking branch 'remotes/origin/ignite-3477' into ignite-4652 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit:

[7/7] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-3477' into ignite-4652

2017-02-08 Thread sboikov
Merge remote-tracking branch 'remotes/origin/ignite-3477' into ignite-4652 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f979979a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f979979a Diff: