Skip to content

Commit d4b4b74

Browse files
parvezahparvezah
committed
Fixing Merge Errors
1 parent 9819fb2 commit d4b4b74

8 files changed

+4593
-65
lines changed

‎src/ResourceManager/KeyVault/Commands.KeyVault/Microsoft.Azure.Commands.KeyVault.dll-help.xml

Lines changed: 4583 additions & 0 deletions
Large diffs are not rendered by default.

‎src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/Migration/ConfirmAzureStorSimpleLegacyVolumeContainerStatus.cs

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ public class ConfirmAzureStorSimpleLegacyVolumeContainerStatus : StorSimpleCmdle
3434
[ValidateSet("Commit", "Rollback", IgnoreCase = true)]
3535
public string MigrationOperation { get; set; }
3636

37-
<<<<<<< HEAD
3837
[Parameter(Mandatory = true, Position = 2, ParameterSetName = StorSimpleCmdletParameterSet.MigrateSpecificContainer,
3938
HelpMessage = StorSimpleCmdletHelpMessage.MigrationLegacyDataContainers)]
4039
public string[] LegacyContainerNames { get; set; }
@@ -43,20 +42,13 @@ public class ConfirmAzureStorSimpleLegacyVolumeContainerStatus : StorSimpleCmdle
4342
HelpMessage = StorSimpleCmdletHelpMessage.MigrationAllContainers)]
4443
public SwitchParameter All { get; set; }
4544

46-
=======
47-
[Parameter(Mandatory = false, Position = 2,
48-
HelpMessage = StorSimpleCmdletHelpMessage.MigrationLegacyDataContainers)]
49-
public string[] LegacyContainerNames { get; set; }
50-
51-
>>>>>>> upstream/dev
5245
public override void ExecuteCmdlet()
5346
{
5447
try
5548
{
5649
var confirmMigrationRequest = new MigrationConfirmStatusRequest();
5750
confirmMigrationRequest.Operation =
58-
(MigrationOperation) Enum.Parse(typeof (MigrationOperation), MigrationOperation, true);
59-
<<<<<<< HEAD
51+
(MigrationOperation)Enum.Parse(typeof(MigrationOperation), MigrationOperation, true);
6052
switch (ParameterSetName)
6153
{
6254
case StorSimpleCmdletParameterSet.MigrateAllContainer:
@@ -66,9 +58,9 @@ public override void ExecuteCmdlet()
6658
}
6759
case StorSimpleCmdletParameterSet.MigrateSpecificContainer:
6860
{
69-
confirmMigrationRequest.DataContainerNameList =
70-
new List<string>(LegacyContainerNames.ToList().Distinct(
71-
StringComparer.InvariantCultureIgnoreCase));
61+
confirmMigrationRequest.DataContainerNameList =
62+
new List<string>(LegacyContainerNames.ToList().Distinct(
63+
StringComparer.InvariantCultureIgnoreCase));
7264
break;
7365
}
7466
default:
@@ -79,11 +71,6 @@ public override void ExecuteCmdlet()
7971
}
8072
}
8173

82-
=======
83-
confirmMigrationRequest.DataContainerNameList = (null != LegacyContainerNames)
84-
? new List<string>(LegacyContainerNames.ToList().Distinct(StringComparer.InvariantCultureIgnoreCase))
85-
: new List<string>();
86-
>>>>>>> upstream/dev
8774
var status = StorSimpleClient.ConfirmLegacyVolumeContainerStatus(LegacyConfigId, confirmMigrationRequest);
8875
MigrationCommonModelFormatter opFormatter = new MigrationCommonModelFormatter();
8976
WriteObject(opFormatter.GetResultMessage(Resources.ConfirmMigrationSuccessMessage, status));

‎src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/Migration/GetAzureStorSimpleLegacyVolumeContainerConfirmStatus.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,8 @@
1919

2020
namespace Microsoft.WindowsAzure.Commands.StorSimple.Cmdlets
2121
{
22-
<<<<<<< HEAD
2322
[Cmdlet(VerbsCommon.Get, "AzureStorSimpleLegacyVolumeContainerConfirmStatus"),
24-
OutputType(typeof (ConfirmMigrationStatusMsg))]
25-
=======
26-
[Cmdlet(VerbsCommon.Get, "AzureStorSimpleLegacyVolumeContainerConfirmStatus")]
27-
>>>>>>> upstream/dev
23+
OutputType(typeof(ConfirmMigrationStatusMsg))]
2824
public class GetAzureStorSimpleLegacyVolumeContainerConfirmStatus : StorSimpleCmdletBase
2925
{
3026
[Parameter(Mandatory = true, Position = 0, HelpMessage = StorSimpleCmdletHelpMessage.MigrationConfigId)]

‎src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/Migration/GetAzureStorSimpleLegacyVolumeContainerMigrationPlan.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,8 @@
2121

2222
namespace Microsoft.WindowsAzure.Commands.StorSimple.Cmdlets
2323
{
24-
<<<<<<< HEAD
2524
[Cmdlet(VerbsCommon.Get, "AzureStorSimpleLegacyVolumeContainerMigrationPlan"),
26-
OutputType(typeof (MigrationConfig), typeof (MigrationPlanMsg))]
27-
=======
28-
[Cmdlet(VerbsCommon.Get, "AzureStorSimpleLegacyVolumeContainerMigrationPlan"), OutputType(typeof(MigrationConfig), typeof(MigrationPlanMsg))]
29-
>>>>>>> upstream/dev
25+
OutputType(typeof(MigrationConfig), typeof(MigrationPlanMsg))]
3026
public class GetAzureStorSimpleLegacyVolumeContainerMigrationPlan : StorSimpleCmdletBase
3127
{
3228
[Parameter(Mandatory = false, Position = 0, HelpMessage = StorSimpleCmdletHelpMessage.MigrationConfigId)]

‎src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/Migration/GetAzureStorSimpleLegacyVolumeContainerStatus.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,8 @@
2020

2121
namespace Microsoft.WindowsAzure.Commands.StorSimple.Cmdlets
2222
{
23-
<<<<<<< HEAD
2423
[Cmdlet(VerbsCommon.Get, "AzureStorSimpleLegacyVolumeContainerStatus"),
25-
OutputType(typeof (DataContainerMigrationStatus))]
26-
=======
27-
[Cmdlet(VerbsCommon.Get, "AzureStorSimpleLegacyVolumeContainerStatus")]
28-
>>>>>>> upstream/dev
24+
OutputType(typeof(DataContainerMigrationStatus))]
2925
public class GetAzureStorSimpleLegacyVolumeContainerStatus : StorSimpleCmdletBase
3026
{
3127
[Parameter(Mandatory = true, Position = 0, HelpMessage = StorSimpleCmdletHelpMessage.MigrationConfigId)]

‎src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/Migration/ImportAzureStorSimpleLegacyApplianceConfig.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@
2222

2323
namespace Microsoft.WindowsAzure.Commands.StorSimple.Cmdlets
2424
{
25-
<<<<<<< HEAD
2625
[Cmdlet(VerbsData.Import, "AzureStorSimpleLegacyApplianceConfig"), OutputType(typeof(LegacyApplianceConfiguration))]
27-
=======
28-
[Cmdlet(VerbsData.Import, "AzureStorSimpleLegacyApplianceConfig")]
29-
>>>>>>> upstream/dev
3026
public class ImportAzureStorSimpleLegacyApplianceConfig : StorSimpleCmdletBase
3127
{
3228

@@ -103,11 +99,11 @@ public override void ExecuteCmdlet()
10399
internal override void HandleException(Exception exception)
104100
{
105101
// Parser throws missing member exception if any expected fields are missing, handling this as special case.
106-
if (typeof (MissingMemberException) == exception.GetType())
102+
if (typeof(MissingMemberException) == exception.GetType())
107103
{
108104
WriteError(new ErrorRecord(exception, string.Empty, ErrorCategory.ParserError, null));
109105
}
110-
else if (typeof (CryptographicException) == exception.GetType())
106+
else if (typeof(CryptographicException) == exception.GetType())
111107
{
112108
WriteError(
113109
new ErrorRecord(

‎src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/Migration/ImportAzureStorSimpleLegacyVolumeContainer.cs

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,14 @@ public class ImportAzureStorSimpleLegacyVolumeContainer : StorSimpleCmdletBase
2929
[ValidateNotNullOrEmpty]
3030
public string LegacyConfigId { get; set; }
3131

32-
<<<<<<< HEAD
3332
[Parameter(Mandatory = true, Position = 1, ParameterSetName = StorSimpleCmdletParameterSet.MigrateSpecificContainer,
3433
HelpMessage = StorSimpleCmdletHelpMessage.MigrationLegacyDataContainers)]
3534
public string[] LegacyContainerNames { get; set; }
3635

3736
[Parameter(Mandatory = true, Position = 1, ParameterSetName = StorSimpleCmdletParameterSet.MigrateAllContainer,
3837
HelpMessage = StorSimpleCmdletHelpMessage.MigrationAllContainers)]
39-
public SwitchParameter All { get; set; }
38+
public SwitchParameter All { get; set; }
4039

41-
=======
42-
[Parameter(Mandatory = false, Position = 1,
43-
HelpMessage = StorSimpleCmdletHelpMessage.MigrationLegacyDataContainers)]
44-
public string[] LegacyContainerNames { get; set; }
45-
46-
>>>>>>> upstream/dev
4740
[Parameter(Mandatory = false, Position = 2,
4841
HelpMessage = StorSimpleCmdletHelpMessage.MigrationImportDCWithSkipACRs)]
4942
public SwitchParameter SkipACRs { get; set; }
@@ -56,7 +49,6 @@ public override void ExecuteCmdlet()
5649
try
5750
{
5851
var importDataContainerRequest = new MigrationImportDataContainerRequest();
59-
<<<<<<< HEAD
6052
switch (ParameterSetName)
6153
{
6254
case StorSimpleCmdletParameterSet.MigrateAllContainer:
@@ -79,11 +71,6 @@ public override void ExecuteCmdlet()
7971
}
8072
}
8173

82-
=======
83-
importDataContainerRequest.DataContainerNames = (null != LegacyContainerNames)
84-
? new List<string>(LegacyContainerNames.ToList().Distinct(StringComparer.InvariantCultureIgnoreCase))
85-
: new List<string>();
86-
>>>>>>> upstream/dev
8774
importDataContainerRequest.ForceOnOtherDevice = Force.IsPresent;
8875
importDataContainerRequest.SkipACRs = SkipACRs.IsPresent;
8976

‎src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/Migration/StartAzureStorSimpleLegacyVolumeContainerMigrationPlan.cs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ public class StartAzureStorSimpleLegacyVolumeContainerMigrationPlan : StorSimple
2929
[ValidateNotNullOrEmpty]
3030
public string LegacyConfigId { get; set; }
3131

32-
<<<<<<< HEAD
3332
[Parameter(Mandatory = true, Position = 1, ParameterSetName = StorSimpleCmdletParameterSet.MigrateSpecificContainer,
3433
HelpMessage = StorSimpleCmdletHelpMessage.MigrationLegacyDataContainers)]
3534
public string[] LegacyContainerNames { get; set; }
@@ -38,19 +37,12 @@ public class StartAzureStorSimpleLegacyVolumeContainerMigrationPlan : StorSimple
3837
HelpMessage = StorSimpleCmdletHelpMessage.MigrationAllContainers)]
3938
public SwitchParameter All { get; set; }
4039

41-
=======
42-
[Parameter(Mandatory = false, Position = 1,
43-
HelpMessage = StorSimpleCmdletHelpMessage.MigrationLegacyDataContainers)]
44-
public string[] LegacyContainerNames { get; set; }
45-
46-
>>>>>>> upstream/dev
4740
public override void ExecuteCmdlet()
4841
{
4942
try
5043
{
5144
var startMigrationPlanRequest = new MigrationPlanStartRequest();
5245
startMigrationPlanRequest.ConfigId = LegacyConfigId;
53-
<<<<<<< HEAD
5446
switch (ParameterSetName)
5547
{
5648
case StorSimpleCmdletParameterSet.MigrateAllContainer:
@@ -72,11 +64,6 @@ public override void ExecuteCmdlet()
7264
string.Format(Resources.MigrationParameterSetNotFound, ParameterSetName));
7365
}
7466
}
75-
=======
76-
startMigrationPlanRequest.DataContainerNameList = (null != LegacyContainerNames)
77-
? new List<string>(LegacyContainerNames.ToList().Distinct(StringComparer.InvariantCultureIgnoreCase))
78-
: new List<string>();
79-
>>>>>>> upstream/dev
8067

8168
var status = StorSimpleClient.StartLegacyVolumeContainerMigrationPlan(startMigrationPlanRequest);
8269
MigrationCommonModelFormatter opFormatter = new MigrationCommonModelFormatter();

0 commit comments

Comments
 (0)