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/bedd357b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bedd357b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bedd357b Branch: refs/heads/ignite-1537 Commit: bedd357bc702db349e15d22c53f75ba9554bacef Parents: 30f3c34 b906ed3 Author: sboikov <sboi...@gridgain.com> Authored: Mon Dec 14 15:22:09 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Dec 14 15:22:09 2015 +0300 ---------------------------------------------------------------------- .../cache/IgniteBinaryObjectFieldsQuerySelfTest.java | 2 +- modules/platforms/cpp/common/src/java.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
