Merge branch 'hotfix/scp-exception' of https://github.com/DaanHoogland/cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/245c3253 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/245c3253 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/245c3253 Branch: refs/heads/master Commit: 245c32538b9e161190061ca914dc6bceca1f725b Parents: b3281ee e13d45e Author: Daan Hoogland <[email protected]> Authored: Sat Feb 21 14:06:16 2015 +0100 Committer: Daan Hoogland <[email protected]> Committed: Sat Feb 21 14:06:16 2015 +0100 ---------------------------------------------------------------------- .../xenserver/resource/CitrixResourceBase.java | 24 ++++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
