You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/05/26 14:41:16 UTC
git commit: updated refs/heads/4.4 to 1fea5d9
Repository: cloudstack
Updated Branches:
refs/heads/4.4 6f2ee6daa -> 1fea5d9ea
Fixed windows line ending issues
Conflicts:
plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1fea5d9e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1fea5d9e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1fea5d9e
Branch: refs/heads/4.4
Commit: 1fea5d9ea793ff78625f7f506ae503fb37a59b41
Parents: 6f2ee6d
Author: Rajesh Battala <ra...@citrix.com>
Authored: Wed May 7 15:13:06 2014 +0530
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon May 26 14:40:43 2014 +0200
----------------------------------------------------------------------
.../ServerResource/HypervResource/HypervResourceController.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1fea5d9e/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
index 67c367d..b6f9a01 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
@@ -1172,7 +1172,7 @@ namespace HypervResource
string defaultDataPath = wmiCallsV2.GetDefaultDataRoot();
string secondaryPath = Utils.NormalizePath(Path.Combine(share.UncPath, "systemvm"));
- string[] choices = choices = Directory.GetFiles(secondaryPath, "systemvm*.iso");
+ string[] choices = Directory.GetFiles(secondaryPath, "systemvm*.iso");
if (choices.Length != 1)
{
String errMsg = "Couldn't locate the systemvm iso on " + secondaryPath;