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/388c1736 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/388c1736 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/388c1736 Branch: refs/heads/ignite-1537 Commit: 388c173651781232205e545453cfdaf636e11a31 Parents: 46872d6 2e68a87 Author: sboikov <sboi...@gridgain.com> Authored: Thu Dec 10 16:45:34 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Dec 10 16:45:34 2015 +0300 ---------------------------------------------------------------------- .../examples/datagrid/CacheTransactionExample.java | 4 ++-- .../apache/ignite/internal/util/nio/GridNioServer.java | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) ----------------------------------------------------------------------