Skip to content

ShortTermRetentionManagedInstance#4934

Closed
v-djnisi wants to merge 4 commits intoAzure:psSdkJson6from
v-djnisi:ShortTermRetentionManagedInstance
Closed

ShortTermRetentionManagedInstance#4934
v-djnisi wants to merge 4 commits intoAzure:psSdkJson6from
v-djnisi:ShortTermRetentionManagedInstance

Conversation

@v-djnisi
Copy link
Contributor

Description

This are clients for short term retention on managed instance. I generated new clients and added new scenario tests.

Azure-Rest-API-Specs pull request: Azure/azure-rest-api-specs#3979

This checklist is used to make sure that common guidelines for a pull request are followed.

General Guidelines

  • Title of the pull request is clear and informative.
  • There are a small number of commits, each of which have an informative message. This means that previously merged commits do not appear in the history of the PR. For more information on cleaning up the commits in your PR, see this page.

Testing Guidelines

  • Pull request includes test coverage for the included changes.

SDK Generation Guidelines

  • If an SDK is being regenerated based on a new swagger spec, a link to the pull request containing these swagger spec changes has been included above.
  • The generate.cmd file for the SDK has been updated with the version of AutoRest, as well as the commitid of your swagger spec or link to the swagger spec, used to generate the code.
  • The *.csproj and AssemblyInfo.cs files have been updated with the new version of the SDK.

@msftclas
Copy link

msftclas commented Oct 26, 2018

CLA assistant check
All CLA requirements met.

@azuresdkci
Copy link
Contributor

Can one of the admins verify this patch?

@shahabhijeet
Copy link
Contributor

@v-djnisi please join aka.ms/azuregithub to get access to the azure org and get authenticated to kick off CI process.

@v-djnisi
Copy link
Contributor Author

@shahabhijeet Done

Copy link
Contributor

@dsgouda dsgouda left a comment

Choose a reason for hiding this comment

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

Looks good for the most part

@dsgouda
Copy link
Contributor

dsgouda commented Oct 29, 2018

@v-djnisi please join Azure org here to kick off the build

Copy link
Contributor

@dsgouda dsgouda left a comment

Choose a reason for hiding this comment

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

Looks good, please squash commits into a single commit and we should be good to merge

@v-djnisi
Copy link
Contributor Author

@dsgouda This is the first time I am using git. I synced the code midway, and I have no idea how to to squash commits, since they are not consecutive, and are already pushed. I tried rebasing, but couldn't get it to work properly. Can you help me with this?

@dsgouda
Copy link
Contributor

dsgouda commented Oct 30, 2018

There is a simple way to do it.

  1. Copy all the files you have modified in a temp location outside the repo
  2. Checkout psSdkJson6 branch, pull latest changes from remote (git pull https://github.com/Azure/azure-sdk-for-net.git psSdkJson6)
  3. Create a new branch (git checkout -b branch_name)
  4. Copy over the changes from temp location to this branch
  5. Push this branch to remote (git push upstream branch_name)
  6. Close this PR and open a new PR with the new branch and reference this PR there

Hope this helps

@v-djnisi v-djnisi mentioned this pull request Oct 31, 2018
9 tasks
@v-djnisi
Copy link
Contributor Author

@dsgouda Thank you for the help. This is the new PR #4982.

@v-djnisi v-djnisi closed this Oct 31, 2018
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.

5 participants