[AutoPR subscription/resource-manager] Update subscription creation ARM API in Microsoft.Subscription RP#2242
Closed
AutorestCI wants to merge 10 commits intorestapi_auto_subscription/resource-managerfrom
Closed
Conversation
Adding the tag package-all-subscription
Adding the tag package-all-subscription
Adding the tag package-all-subscription
Merging subscriptions.json swagger from Microsoft.Resources in Microsoft.Subscriptions swagger so that --package-all-subscriptions tag can produce a single package
Rename the client from SubscriptionManagementClient to SubscriptionClient
making object id a string instead of guid, and removing tenant id
Updating examples
removed extra property from required in model
Getting the new stable subscriptions.json
Getting the new stable subscriptions.json
Merged
10 tasks
Member
|
@AutorestCI rebase |
Contributor
Author
Encountered an unknown error
Traceback (most recent call last):
File "/usr/local/lib/python3.6/dist-packages/swaggertosdk/github_tools.py", line 32, in exception_to_github
yield context
File "/usr/local/lib/python3.6/dist-packages/swaggertosdk/restapi/bot_framework.py", line 104, in manage_comment
response = getattr(self.handler, orderstr)(webhook_data.issue, *split_text)
File "/usr/local/lib/python3.6/dist-packages/swaggertosdk/restapi/sdkbot.py", line 64, in rebase
msg = sdk_repo.git.rebase('upstream/{}'.format(upstream_base))
File "/usr/local/lib/python3.6/dist-packages/git/cmd.py", line 551, in <lambda>
return lambda *args, **kwargs: self._call_process(name, *args, **kwargs)
File "/usr/local/lib/python3.6/dist-packages/git/cmd.py", line 1010, in _call_process
return self.execute(call, **exec_kwargs)
File "/usr/local/lib/python3.6/dist-packages/git/cmd.py", line 821, in execute
raise GitCommandError(command, status, stderr_value, stdout_value)
git.exc.GitCommandError: Cmd('git') failed due to: exit code(128)
cmdline: git rebase upstream/restapi_auto_subscription/resource-manager
stdout: 'First, rewinding head to replay your work on top of it...
Applying: Generated from 549bb107521c6fdf98f1457ddf428365533d43ec
Using index info to reconstruct a base tree...
M azure-mgmt-subscription/azure/mgmt/subscription/models/__init__.py
M azure-mgmt-subscription/azure/mgmt/subscription/models/error_response.py
M azure-mgmt-subscription/azure/mgmt/subscription/models/location.py
M azure-mgmt-subscription/azure/mgmt/subscription/models/operation.py
M azure-mgmt-subscription/azure/mgmt/subscription/models/operation_display.py
A azure-mgmt-subscription/azure/mgmt/subscription/models/operation_paged.py
M azure-mgmt-subscription/azure/mgmt/subscription/models/subscription.py
M azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_client_enums.py
A azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_definition.py
A azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_definition_paged.py
M azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_policies.py
M azure-mgmt-subscription/azure/mgmt/subscription/models/tenant_id_description.py
M azure-mgmt-subscription/azure/mgmt/subscription/operations/__init__.py
A azure-mgmt-subscription/azure/mgmt/subscription/operations/subscription_definitions_operation_metadata_operations.py
A azure-mgmt-subscription/azure/mgmt/subscription/operations/subscription_definitions_operations.py
M azure-mgmt-subscription/azure/mgmt/subscription/operations/subscriptions_operations.py
M azure-mgmt-subscription/azure/mgmt/subscription/operations/tenants_operations.py
M azure-mgmt-subscription/azure/mgmt/subscription/subscription_client.py
M azure-mgmt-subscription/azure/mgmt/subscription/version.py
Falling back to patching base and 3-way merge...
Auto-merging azure-mgmt-subscription/build.json
CONFLICT (add/add): Merge conflict in azure-mgmt-subscription/build.json
Auto-merging azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_creation_parameters_py3.py
CONFLICT (add/add): Merge conflict in azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_creation_parameters_py3.py
Auto-merging azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_creation_parameters.py
CONFLICT (add/add): Merge conflict in azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_creation_parameters.py
Auto-merging azure-mgmt-subscription/azure/mgmt/subscription/models/ad_principal_py3.py
CONFLICT (add/add): Merge conflict in azure-mgmt-subscription/azure/mgmt/subscription/models/ad_principal_py3.py
Auto-merging azure-mgmt-subscription/azure/mgmt/subscription/models/ad_principal.py
CONFLICT (add/add): Merge conflict in azure-mgmt-subscription/azure/mgmt/subscription/models/ad_principal.py
CONFLICT (rename/rename): Rename "azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_definition_paged.py"->"azure-mgmt-resource/azure/mgmt/resource/subscriptions/v2016_06_01/models/subscription_paged.py" in branch "e210198a6f39aa29ee98307f2799c4737cfef516" rename "azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_definition_paged.py"->"azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_creation_result_py3.py" in "Generated from 549bb107521c6fdf98f1457ddf428365533d43ec"
CONFLICT (rename/delete): azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/operations.py deleted in Generated from 549bb107521c6fdf98f1457ddf428365533d43ec and renamed in e210198a6f39aa29ee98307f2799c4737cfef516. Version e210198a6f39aa29ee98307f2799c4737cfef516 of azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/operations.py left in tree.
CONFLICT (rename/rename): Rename "azure-mgmt-subscription/azure/mgmt/subscription/models/operation_paged.py"->"azure-mgmt-batch/azure/mgmt/batch/models/operation_paged.py" in branch "e210198a6f39aa29ee98307f2799c4737cfef516" rename "azure-mgmt-subscription/azure/mgmt/subscription/models/operation_paged.py"->"azure-mgmt-subscription/azure/mgmt/subscription/models/subscription_creation_result.py" in "Generated from 549bb107521c6fdf98f1457ddf428365533d43ec"
CONFLICT (rename/delete): azure-mgmt-advisor/azure/mgmt/advisor/operations/recommendations_operations.py deleted in Generated from 549bb107521c6fdf98f1457ddf428365533d43ec and renamed in e210198a6f39aa29ee98307f2799c4737cfef516. Version e210198a6f39aa29ee98307f2799c4737cfef516 of azure-mgmt-advisor/azure/mgmt/advisor/operations/recommendations_operations.py left in tree.
Patch failed at 0001 Generated from 549bb107521c6fdf98f1457ddf428365533d43ec
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
'
stderr: 'error: Failed to merge in the changes.' |
Member
|
See #2241 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Created to sync Azure/azure-rest-api-specs#2535