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/7d8cadec Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7d8cadec Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7d8cadec Branch: refs/heads/ignite-1537 Commit: 7d8cadecd13537763d4477343588550220d43d57 Parents: 445e2e6 2e68a87 Author: sboikov <sboi...@gridgain.com> Authored: Thu Dec 10 16:15:03 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Dec 10 16:15:03 2015 +0300 ---------------------------------------------------------------------- .../examples/datagrid/CacheTransactionExample.java | 4 ++-- .../apache/ignite/internal/util/nio/GridNioServer.java | 11 +++++------ modules/osgi-karaf/src/main/resources/features.xml | 11 +++++++---- 3 files changed, 14 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
