Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9b60c75c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9b60c75c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9b60c75c Branch: refs/heads/ignite-1.5.1 Commit: 9b60c75c62d2e352a4a65b7c5a0b17bc79499ba8 Parents: f770954 ae40e2d Author: sboikov <sboi...@gridgain.com> Authored: Thu Dec 3 10:42:50 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Dec 3 10:42:50 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/configuration/IgniteConfiguration.java | 4 ++-- .../cache/GridCacheMultinodeUpdateNearEnabledSelfTest.java | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
