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/2ed17c79 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2ed17c79 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2ed17c79 Branch: refs/heads/object_store Commit: 2ed17c7930e1c35ea79e70a39c86336d554f5218 Parents: 51a3a5a fe506d9 Author: Wei Zhou <[email protected]> Authored: Wed Jun 12 11:57:37 2013 +0200 Committer: Wei Zhou <[email protected]> Committed: Wed Jun 12 11:57:37 2013 +0200 ---------------------------------------------------------------------- .../hypervisor/xen/discoverer/XcpServerDiscoverer.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
