mirror of https://github.com/apache/cloudstack.git
Fixed windows line ending issues
(cherry picked from commit 648a724dfc)
Conflicts:
plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
This commit is contained in:
parent
51c691f022
commit
920f39baaf
File diff suppressed because it is too large
Load Diff
|
|
@ -71,8 +71,8 @@ namespace HypervResource
|
|||
Dictionary<String, VmState> GetVmSync(String privateIpAddress);
|
||||
string GetVmNote(System.Management.ManagementPath sysPath);
|
||||
void ModifyVmVLan(string vmName, String vlanid, string mac);
|
||||
void ModifyVmVLan(string vmName, String vlanid, uint pos, bool enable, string switchLabelName);
|
||||
void DisableVmNics();
|
||||
void ModifyVmVLan(string vmName, String vlanid, uint pos, bool enable, string switchLabelName);
|
||||
void DisableVmNics();
|
||||
void DisableNicVlan(String mac, String vmName);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue