[11/11] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537

2015-12-23 Thread sboikov
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Conflicts: modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java

[11/11] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537

2015-12-20 Thread sboikov
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e97a96c7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e97a96c7 Diff: