Updated Branches: refs/heads/api_refactoring beb2fccf1 -> a3c2bb741
Merge branch 'master' into api_refactoring Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a3c2bb74 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a3c2bb74 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a3c2bb74 Branch: refs/heads/api_refactoring Commit: a3c2bb7418d52e2f080e51e94b24106e1829175c Parents: beb2fcc 8f6fdc3 Author: Rohit Yadav <[email protected]> Authored: Sun Dec 23 19:11:43 2012 -0800 Committer: Rohit Yadav <[email protected]> Committed: Sun Dec 23 19:12:04 2012 -0800 ---------------------------------------------------------------------- .../xen/resource/CitrixResourceBase.java | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
