rtyler
/
azure-vm-agents-plugin
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Merge pull request #75 from clguimanMSFT/fix-merge 

fix broken merge
This commit is contained in:
Arjun Roy Chaudhuri 2016-11-28 14:02:22 -08:00 committed by GitHub
parent 292d4cc5ef 59edfc0df6
commit 8b68317817
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/microsoft/azure/AzureVMManagementServiceDelegate.java
View File

@ -342,19 +342,13 @@ public class AzureVMManagementServiceDelegate {
final StorageManagementClient storageClient = ServiceDelegateHelper.getStorageManagementClient(config);
rmClient.getResourceGroupsOperations().createOrUpdate(resourceGroupName, new ResourceGroup(location));
<<<<<<< HEAD
=======
try
{
>>>>>>> 17b8539365c3ff9c006753579036ecd4440ea752
StorageAccountCreateParameters createParams = new StorageAccountCreateParameters();
createParams.setLocation(location);
createParams.setAccountType(AccountType.StandardLRS);
storageClient.getStorageAccountsOperations().create(resourceGroupName, targetStorageAccount, createParams);
}catch (Exception e)
{
try {
StorageAccountCreateParameters createParams = new StorageAccountCreateParameters();
createParams.setLocation(location);
createParams.setAccountType(AccountType.StandardLRS);
storageClient.getStorageAccountsOperations().create(resourceGroupName, targetStorageAccount, createParams);
} catch (Exception e) {
LOGGER.log(Level.INFO, e.getMessage());
}
// Get the storage account name and key