Merge branch 'ignite-gg-10298' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10298
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b8604cb4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b8604cb4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b8604cb4 Branch: refs/heads/ignite-1058 Commit: b8604cb407deb3bd841f308b4ea35aa9cafc8af0 Parents: b40d8a5 9c7e1dc Author: iveselovskiy <[email protected]> Authored: Fri Jun 26 13:22:29 2015 +0300 Committer: iveselovskiy <[email protected]> Committed: Fri Jun 26 13:22:29 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/configuration/IgniteConfiguration.java | 1 + .../core/src/main/java/org/apache/ignite/internal/IgnitionEx.java | 1 + .../ignite/internal/managers/communication/GridIoManager.java | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
