fix build/test failure

Author: blueww

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageBlobTests/TestStorageBlobServiceProperties.json

@@ -221,7 +221,6 @@ Creates a Storage account.
 ### [New-AzStorageAccountKey](New-AzStorageAccountKey.md)
 Regenerates a storage key for an Azure Storage account.
 
-<<<<<<< HEAD
 ### [New-AzStorageLocalUserPermissionScope](New-AzStorageLocalUserPermissionScope.md)
 Creates a permission scope object, which can be used in Set-AzStorageLocalUser.
 
@@ -230,10 +229,9 @@ Regenerate SSH password of a specified local user in a storage account.
 
 ### [New-AzStorageLocalUserSshPublicKey](New-AzStorageLocalUserSshPublicKey.md)
 Creates a SSH public key object, which can be used in Set-AzStorageLocalUser.
-=======
+
 ### [New-AzStorageAccountManagementPolicyBlobIndexMatchObject](New-AzStorageAccountManagementPolicyBlobIndexMatchObject.md)
 Creates a ManagementPolicy BlobIndexMatch object, which can be used in New-AzStorageAccountManagementPolicyFilter.
->>>>>>> 2a60e0f135d49aaa190a360967564e0db19dc852
 
 ### [New-AzStorageAccountManagementPolicyFilter](New-AzStorageAccountManagementPolicyFilter.md)
 Creates a ManagementPolicy rule filter object, which can be used in New-AzStorageAccountManagementPolicyRule.

src/Storage/Storage.Management/help/Az.Storage.md

@@ -64,6 +64,7 @@ public class AzureDataLakeGen2DeletedItem : AzureStorageBase
         /// Azure DataLakeGen2 Deleted Item constructor
         /// </summary>
         /// <param name="deletedItem">Deleted Item</param>
+        /// <param name="fileSystem">File System object</param>
         public AzureDataLakeGen2DeletedItem(PathDeletedItem deletedItem, DataLakeFileSystemClient fileSystem)
         {
             this.Name = deletedItem.Path;

src/Storage/Storage/Common/AzureDataLakeGen2DeletedItem.cs

@@ -112,6 +112,7 @@ public class AzureDataLakeGen2Item : AzureStorageBase
         /// Azure DataLakeGen2 Item constructor
         /// </summary>
         /// <param name="pathClient">DataLakePathClient object</param>
+        /// <param name="fileSystem">File System object</param>
         public AzureDataLakeGen2Item(DataLakePathClient pathClient, DataLakeFileSystemClient fileSystem)
         {
             Name = pathClient.Name;
@@ -140,7 +141,7 @@ public AzureDataLakeGen2Item(DataLakePathClient pathClient, DataLakeFileSystemCl
         /// <summary>
         /// Azure DataLakeGen2 Item constructor
         /// </summary>
-        /// <param name="blob">CloudBlockBlob blob object</param>
+        /// <param name="fileClient">Datalake gen2 file object</param>
         public AzureDataLakeGen2Item(DataLakeFileClient fileClient)
         {
             Name = fileClient.Name;

src/Storage/Storage/Common/AzureDataLakeGen2Item.cs

@@ -0,0 +1,4 @@
+"AssemblyFileName","ClassName","Target","Severity","ProblemId","Description","Remediation"
+"Microsoft.Azure.PowerShell.Cmdlets.Storage.dll","Microsoft.WindowsAzure.Commands.Storage.Table.Cmdlet.GetAzureStorageTableStoredAccessPolicyCommand","Get-AzStorageTableStoredAccessPolicy","0","1020","The cmdlet 'Get-AzStorageTableStoredAccessPolicy' no longer has output type 'Microsoft.Azure.Cosmos.Table.SharedAccessTablePolicy'.","Make cmdlet 'Get-AzStorageTableStoredAccessPolicy' return type 'Microsoft.Azure.Cosmos.Table.SharedAccessTablePolicy'."
+"Microsoft.Azure.PowerShell.Cmdlets.Storage.dll","Microsoft.WindowsAzure.Commands.Storage.Queue.Cmdlet.GetAzureStorageQueueStoredAccessPolicyCommand","Get-AzStorageQueueStoredAccessPolicy","0","1020","The cmdlet 'Get-AzStorageQueueStoredAccessPolicy' no longer has output type 'Microsoft.Azure.Storage.Queue.SharedAccessQueuePolicy'.","Make cmdlet 'Get-AzStorageQueueStoredAccessPolicy' return type 'Microsoft.Azure.Storage.Queue.SharedAccessQueuePolicy'."
+"Microsoft.Azure.PowerShell.Cmdlets.Storage.dll","Microsoft.WindowsAzure.Commands.Storage.File.Cmdlet.GetAzureStorageShareStoredAccessPolicy","Get-AzStorageShareStoredAccessPolicy","0","1020","The cmdlet 'Get-AzStorageShareStoredAccessPolicy' no longer has output type 'Microsoft.Azure.Storage.File.SharedAccessFilePolicy'.","Make cmdlet 'Get-AzStorageShareStoredAccessPolicy' return type 'Microsoft.Azure.Storage.File.SharedAccessFilePolicy'."