Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ef866399 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ef866399 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ef866399 Branch: refs/heads/master Commit: ef8663998a6687b91fd583fc68e436dd2adb9040 Parents: 6cbd85f 0a5e3fa Author: Pranav Saxena <pranav.sax...@citrix.com> Authored: Thu May 30 15:28:07 2013 +0530 Committer: Pranav Saxena <pranav.sax...@citrix.com> Committed: Thu May 30 15:28:07 2013 +0530 ---------------------------------------------------------------------- .../xen/resource/CitrixResourceBase.java | 19 ++++++++------- 1 files changed, 10 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
