[AutoPR graphrbac/data-plane] GraphRBAC #3243
Closed
Conversation
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
Backward compat for ApplicationAddOwnerParameter
Member
|
@AutorestCI rebase |
Contributor
Author
Encountered an unknown error
Traceback (most recent call last):
File "/usr/local/lib/python3.6/dist-packages/azure_devtools/ci_tools/github_tools.py", line 33, in exception_to_github
yield context
File "/usr/local/lib/python3.6/dist-packages/azure_devtools/ci_tools/bot_framework.py", line 105, 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 548, in <lambda>
return lambda *args, **kwargs: self._call_process(name, *args, **kwargs)
File "/usr/local/lib/python3.6/dist-packages/git/cmd.py", line 1014, in _call_process
return self.execute(call, **exec_kwargs)
File "/usr/local/lib/python3.6/dist-packages/git/cmd.py", line 825, 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_graphrbac/data-plane
stdout: 'First, rewinding head to replay your work on top of it...
Applying: Generated from 38da2338b7f2a290829acc0a0cd49cf1edc4cc0b
Using index info to reconstruct a base tree...
M azure-graphrbac/azure/graphrbac/graph_rbac_management_client.py
M azure-graphrbac/azure/graphrbac/models/__init__.py
M azure-graphrbac/azure/graphrbac/models/aad_object.py
M azure-graphrbac/azure/graphrbac/models/ad_group.py
M azure-graphrbac/azure/graphrbac/models/application.py
M azure-graphrbac/azure/graphrbac/models/application_add_owner_parameters.py
M azure-graphrbac/azure/graphrbac/models/application_create_parameters.py
M azure-graphrbac/azure/graphrbac/models/application_update_parameters.py
M azure-graphrbac/azure/graphrbac/models/check_group_membership_parameters.py
M azure-graphrbac/azure/graphrbac/models/check_group_membership_result.py
M azure-graphrbac/azure/graphrbac/models/directory_object.py
M azure-graphrbac/azure/graphrbac/models/domain.py
M azure-graphrbac/azure/graphrbac/models/get_objects_parameters.py
M azure-graphrbac/azure/graphrbac/models/graph_error.py
M azure-graphrbac/azure/graphrbac/models/graph_rbac_management_client_enums.py
M azure-graphrbac/azure/graphrbac/models/group_add_member_parameters.py
M azure-graphrbac/azure/graphrbac/models/group_create_parameters.py
M azure-graphrbac/azure/graphrbac/models/group_get_member_groups_parameters.py
M azure-graphrbac/azure/graphrbac/models/key_credential.py
M azure-graphrbac/azure/graphrbac/models/key_credentials_update_parameters.py
M azure-graphrbac/azure/graphrbac/models/password_credential.py
M azure-graphrbac/azure/graphrbac/models/password_credentials_update_parameters.py
M azure-graphrbac/azure/graphrbac/models/password_profile.py
M azure-graphrbac/azure/graphrbac/models/permissions.py
M azure-graphrbac/azure/graphrbac/models/required_resource_access.py
M azure-graphrbac/azure/graphrbac/models/resource_access.py
M azure-graphrbac/azure/graphrbac/models/service_principal.py
M azure-graphrbac/azure/graphrbac/models/service_principal_create_parameters.py
M azure-graphrbac/azure/graphrbac/models/sign_in_name.py
M azure-graphrbac/azure/graphrbac/models/user.py
M azure-graphrbac/azure/graphrbac/models/user_base.py
M azure-graphrbac/azure/graphrbac/models/user_create_parameters.py
M azure-graphrbac/azure/graphrbac/models/user_get_member_groups_parameters.py
M azure-graphrbac/azure/graphrbac/models/user_update_parameters.py
M azure-graphrbac/azure/graphrbac/operations/applications_operations.py
M azure-graphrbac/azure/graphrbac/operations/domains_operations.py
M azure-graphrbac/azure/graphrbac/operations/groups_operations.py
M azure-graphrbac/azure/graphrbac/operations/oauth2_operations.py
M azure-graphrbac/azure/graphrbac/operations/objects_operations.py
M azure-graphrbac/azure/graphrbac/operations/service_principals_operations.py
M azure-graphrbac/azure/graphrbac/operations/users_operations.py
Falling back to patching base and 3-way merge...
Auto-merging azure-graphrbac/azure/graphrbac/operations/objects_operations.py
CONFLICT (content): Merge conflict in azure-graphrbac/azure/graphrbac/operations/objects_operations.py
Auto-merging azure-graphrbac/azure/graphrbac/operations/groups_operations.py
Auto-merging azure-graphrbac/azure/graphrbac/models/service_principal_py3.py
CONFLICT (add/add): Merge conflict in azure-graphrbac/azure/graphrbac/models/service_principal_py3.py
Auto-merging azure-graphrbac/azure/graphrbac/models/service_principal.py
CONFLICT (content): Merge conflict in azure-graphrbac/azure/graphrbac/models/service_principal.py
Auto-merging azure-graphrbac/azure/graphrbac/models/application_py3.py
CONFLICT (add/add): Merge conflict in azure-graphrbac/azure/graphrbac/models/application_py3.py
Auto-merging azure-graphrbac/azure/graphrbac/models/application_add_owner_parameters_py3.py
CONFLICT (add/add): Merge conflict in azure-graphrbac/azure/graphrbac/models/application_add_owner_parameters_py3.py
Auto-merging azure-graphrbac/azure/graphrbac/models/application_add_owner_parameters.py
CONFLICT (content): Merge conflict in azure-graphrbac/azure/graphrbac/models/application_add_owner_parameters.py
Auto-merging azure-graphrbac/azure/graphrbac/models/application.py
CONFLICT (content): Merge conflict in azure-graphrbac/azure/graphrbac/models/application.py
Auto-merging azure-graphrbac/azure/graphrbac/models/ad_group_py3.py
CONFLICT (add/add): Merge conflict in azure-graphrbac/azure/graphrbac/models/ad_group_py3.py
Auto-merging azure-graphrbac/azure/graphrbac/models/ad_group.py
CONFLICT (content): Merge conflict in azure-graphrbac/azure/graphrbac/models/ad_group.py
Auto-merging azure-graphrbac/azure/graphrbac/models/__init__.py
CONFLICT (content): Merge conflict in azure-graphrbac/azure/graphrbac/models/__init__.py
Auto-merging azure-graphrbac/azure/graphrbac/graph_rbac_management_client.py
Patch failed at 0001 Generated from 38da2338b7f2a290829acc0a0cd49cf1edc4cc0b
Use 'git am --show-current-patch' to see the failed patch
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
'
stderr: 'error: Failed to merge in the changes.' |
Contributor
Author
|
(message created by the CI based on PR content) Installation instructionPackage azure-graphrbacYou can install the package You can build a wheel to distribute for test using the following command: If you have a local clone of this repository, you can also do:
Or build a wheel file to distribute for testing:
Direct downloadYour files can be directly downloaded here: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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#3773