Skip to content

Conversation

@shimedh
Copy link
Contributor

@shimedh shimedh commented Sep 21, 2015

1]. Consolidating the existing cmdlets into a single cmdlet and using parameter set
2]. Support number of events parameter

@azuresdkci
Copy link

Can one of the admins verify this patch?

@azurecla
Copy link

Hi @shimedh, I'm your friendly neighborhood Azure Pull Request Bot (You can call me AZPRBOT). Thanks for your contribution!

In order for us to evaluate and accept your PR, we ask that you sign a contribution license agreement. It's all electronic and will take just minutes. I promise there's no faxing. https://cla.azure.com.

TTYL, AZPRBOT;

@ogail
Copy link
Contributor

ogail commented Sep 21, 2015

@shimedh resolve conflicts

Getting upstream master
Conflicts:
	src/ResourceManager/Insights/Commands.Insights/Microsoft.Azure.Commands.Insights.dll-Help.xml
@shimedh
Copy link
Contributor Author

shimedh commented Sep 21, 2015

Hi Abdelrahman,
Should we create a pull request to your master branch or dev branch? What is the difference between the two?

Thanks,
Shibani

From: Abdelrahman Elogeel [mailto:[email protected]]
Sent: Monday, September 21, 2015 11:44 AM
To: Azure/azure-powershell [email protected]
Cc: Shibani Medhekar [email protected]
Subject: Re: [azure-powershell] Powershell Insights Events cmdlets change (#945)

@shimedhhttps://na01.safelinks.protection.outlook.com/?url=https%3a%2f%2fgithub.com%2fshimedh&data=01%7c01%7cshimedh%40microsoft.com%7ccc794b419039479ec18708d2c2b49bad%7c72f988bf86f141af91ab2d7cd011db47%7c1&sdata=xRkjL4kkp0PCab6GupW4LEYisX21HnuVCA5ADVFYas8%3d resolve conflicts


Reply to this email directly or view it on GitHubhttps://na01.safelinks.protection.outlook.com/?url=https%3a%2f%2fgithub.com%2fAzure%2fazure-powershell%2fpull%2f945%23issuecomment-142072141&data=01%7c01%7cshimedh%40microsoft.com%7ccc794b419039479ec18708d2c2b49bad%7c72f988bf86f141af91ab2d7cd011db47%7c1&sdata=H2mhYYL3jSW7vdjMUPUTCI90gk8eWsYeVye1MeWqO4E%3d.

@shimedh
Copy link
Contributor Author

shimedh commented Sep 21, 2015

Hi Abdelrahman,
We have resolved conflicts.

Thanks,
Shibani

From: Abdelrahman Elogeel [mailto:[email protected]]
Sent: Monday, September 21, 2015 11:44 AM
To: Azure/azure-powershell [email protected]
Cc: Shibani Medhekar [email protected]
Subject: Re: [azure-powershell] Powershell Insights Events cmdlets change (#945)

@shimedhhttps://na01.safelinks.protection.outlook.com/?url=https%3a%2f%2fgithub.com%2fshimedh&data=01%7c01%7cshimedh%40microsoft.com%7ccc794b419039479ec18708d2c2b49bad%7c72f988bf86f141af91ab2d7cd011db47%7c1&sdata=xRkjL4kkp0PCab6GupW4LEYisX21HnuVCA5ADVFYas8%3d resolve conflicts


Reply to this email directly or view it on GitHubhttps://na01.safelinks.protection.outlook.com/?url=https%3a%2f%2fgithub.com%2fAzure%2fazure-powershell%2fpull%2f945%23issuecomment-142072141&data=01%7c01%7cshimedh%40microsoft.com%7ccc794b419039479ec18708d2c2b49bad%7c72f988bf86f141af91ab2d7cd011db47%7c1&sdata=H2mhYYL3jSW7vdjMUPUTCI90gk8eWsYeVye1MeWqO4E%3d.

@shimedh
Copy link
Contributor Author

shimedh commented Sep 22, 2015

  • Andy

From: Shibani Medhekar
Sent: Monday, September 21, 2015 1:54 PM
To: 'Azure/azure-powershell' [email protected]; Azure/azure-powershell [email protected]
Subject: RE: [azure-powershell] Powershell Insights Events cmdlets change (#945)

Hi Abdelrahman,
We have resolved conflicts.

Thanks,
Shibani

From: Abdelrahman Elogeel [mailto:[email protected]]
Sent: Monday, September 21, 2015 11:44 AM
To: Azure/azure-powershell <[email protected]mailto:[email protected]>
Cc: Shibani Medhekar <[email protected]mailto:[email protected]>
Subject: Re: [azure-powershell] Powershell Insights Events cmdlets change (#945)

@shimedhhttps://na01.safelinks.protection.outlook.com/?url=https%3a%2f%2fgithub.com%2fshimedh&data=01%7c01%7cshimedh%40microsoft.com%7ccc794b419039479ec18708d2c2b49bad%7c72f988bf86f141af91ab2d7cd011db47%7c1&sdata=xRkjL4kkp0PCab6GupW4LEYisX21HnuVCA5ADVFYas8%3d resolve conflicts


Reply to this email directly or view it on GitHubhttps://na01.safelinks.protection.outlook.com/?url=https%3a%2f%2fgithub.com%2fAzure%2fazure-powershell%2fpull%2f945%23issuecomment-142072141&data=01%7c01%7cshimedh%40microsoft.com%7ccc794b419039479ec18708d2c2b49bad%7c72f988bf86f141af91ab2d7cd011db47%7c1&sdata=H2mhYYL3jSW7vdjMUPUTCI90gk8eWsYeVye1MeWqO4E%3d.

@stankovski
Copy link
Member

@shimedh resolve conflicts; dev branch is fine

@stankovski
Copy link
Member

@azuresdkci add to whitelist

…ershell into dev

Conflicts:
	src/ResourceManager/Insights/Commands.Insights.Test/Commands.Insights.Test.csproj
	src/ResourceManager/Insights/Commands.Insights.Test/ScenarioTests/EventsTests.ps1
	src/ResourceManager/Insights/Commands.Insights/Commands.Insights.csproj
	src/ResourceManager/Insights/Commands.Insights/Events/GetAzureCorrelationIdLogCommand.cs
	src/ResourceManager/Insights/Commands.Insights/Events/GetAzureResourceGroupLogCommand.cs
	src/ResourceManager/Insights/Commands.Insights/Events/GetAzureResourceLogCommand.cs
	src/ResourceManager/Insights/Commands.Insights/Events/GetAzureResourceProviderLogCommand.cs
	src/ResourceManager/Insights/Commands.Insights/Events/GetAzureSubscriptionIdLogCommand.cs
	src/ResourceManager/Insights/Commands.Insights/Microsoft.Azure.Commands.Insights.dll-Help.xml
@shimedh
Copy link
Contributor Author

shimedh commented Sep 23, 2015

Resolved Conflicts

Conflicts:
	src/ResourceManager/Insights/Commands.Insights.Test/ScenarioTests/EventsTests.ps1
	src/ResourceManager/Insights/Commands.Insights/Events/GetAzureCorrelationIdLogCommand.cs
	src/ResourceManager/Insights/Commands.Insights/Events/GetAzureResourceGroupLogCommand.cs
	src/ResourceManager/Insights/Commands.Insights/Events/GetAzureResourceLogCommand.cs
	src/ResourceManager/Insights/Commands.Insights/Events/GetAzureResourceProviderLogCommand.cs
	src/ResourceManager/Insights/Commands.Insights/Events/GetAzureSubscriptionIdLogCommand.cs
	src/ResourceManager/Insights/Commands.Insights/Microsoft.Azure.Commands.Insights.dll-Help.xml
@markcowl
Copy link
Member

@azuresdkci retest this please

1 similar comment
@stankovski
Copy link
Member

@azuresdkci retest this please

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All ResourceManager cmdlets should have AzureRm in the name - e.g. Get-AzureRmLog

@azuresdkci
Copy link

Can one of the admins verify this patch?

1 similar comment
@azuresdkci
Copy link

Can one of the admins verify this patch?

ogail added a commit that referenced this pull request Sep 29, 2015
Powershell Insights Events cmdlets change
@ogail ogail merged commit cb4e63b into Azure:dev Sep 29, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants