Merge branch 'bugfix/CID-116538'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/577a2f40 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/577a2f40 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/577a2f40 Branch: refs/heads/master Commit: 577a2f40b32bb8b9694800b31635ee5e6b16bd26 Parents: e1973a2 de26a72 Author: Hugo Trippaers <[email protected]> Authored: Wed Sep 17 11:40:55 2014 +0200 Committer: Hugo Trippaers <[email protected]> Committed: Wed Sep 17 11:40:55 2014 +0200 ---------------------------------------------------------------------- utils/src/com/cloud/utils/nio/Link.java | 7 +++-- utils/src/com/cloud/utils/nio/NioClient.java | 36 ++++++++--------------- utils/src/com/cloud/utils/nio/NioServer.java | 18 +++++++++--- 3 files changed, 31 insertions(+), 30 deletions(-) ----------------------------------------------------------------------
