Merge remote-tracking branch 'remotes/origin/ignite-sprint-6' into ignite-gg-10411
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/28adb89e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/28adb89e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/28adb89e Branch: refs/heads/ignite-gg-10411 Commit: 28adb89e7f785948e681d866e0c36aba9d2759a9 Parents: 55bb22f 5218210 Author: ptupitsyn <ptupit...@gridgain.com> Authored: Wed Jun 17 17:01:02 2015 +0300 Committer: ptupitsyn <ptupit...@gridgain.com> Committed: Wed Jun 17 17:01:02 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/client/GridClientConfiguration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------