-
Notifications
You must be signed in to change notification settings - Fork 2.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[AutoPR sql/resource-manager] [DO NOT MERGE] Sql job agent #2020
Closed
Conversation
This file contains 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
…l.core.json (#1829) * Generated from 5a6fe19cfbfc33daf461404f3e77978e398bec49 Extract checkNameAvailability.json from sql.core.json * Generated from b1f5dd6f842a458a6c117a2a5da68a7f5d895d77 Fixed cross-file references * Update version.py
Py version for SQL build
Merge remote-tracking branch 'azure/master' into sqljobs3
10 tasks
Codecov Report
@@ Coverage Diff @@
## restapi_auto_sql/resource-manager #2020 +/- ##
=====================================================================
+ Coverage 52.2% 52.68% +0.48%
=====================================================================
Files 4740 4733 -7
Lines 121548 117711 -3837
=====================================================================
- Hits 63453 62015 -1438
+ Misses 58095 55696 -2399
Continue to review full report at Codecov.
|
7ea1f37
to
ff441dd
Compare
@AutorestCI rebase |
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_sql/resource-manager
stdout: 'First, rewinding head to replay your work on top of it...
Applying: Generated from 00c10e2add6a8d8d5c0cd8c28f8f6f09a3dde3b8
Using index info to reconstruct a base tree...
M azure-mgmt-sql/azure/mgmt/sql/models/__init__.py
A azure-mgmt-sql/azure/mgmt/sql/models/database_restore_point.py
A azure-mgmt-sql/azure/mgmt/sql/models/database_restore_point_paged.py
M azure-mgmt-sql/azure/mgmt/sql/operations/__init__.py
M azure-mgmt-sql/azure/mgmt/sql/operations/backup_long_term_retention_policies_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/backup_long_term_retention_vaults_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/capabilities_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/data_masking_policies_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/data_masking_rules_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/database_automatic_tuning_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/database_blob_auditing_policies_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/database_operations.py
A azure-mgmt-sql/azure/mgmt/sql/operations/database_restore_points_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/database_threat_detection_policies_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/database_usages_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/databases_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/elastic_pool_activities_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/elastic_pool_database_activities_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/elastic_pools_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/encryption_protectors_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/failover_groups_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/firewall_rules_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/geo_backup_policies_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/recommended_elastic_pools_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/recoverable_databases_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/replication_links_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/restorable_dropped_databases_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/server_automatic_tuning_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/server_azure_ad_administrators_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/server_communication_links_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/server_connection_policies_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/server_dns_aliases_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/server_keys_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/server_usages_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/servers_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/service_objectives_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/service_tier_advisors_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/subscription_usages_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/sync_agents_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/sync_groups_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/sync_members_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/transparent_data_encryption_activities_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/transparent_data_encryptions_operations.py
M azure-mgmt-sql/azure/mgmt/sql/operations/virtual_network_rules_operations.py
M azure-mgmt-sql/azure/mgmt/sql/sql_management_client.py
Falling back to patching base and 3-way merge...
Auto-merging azure-mgmt-sql/azure/mgmt/sql/sql_management_client.py
Auto-merging azure-mgmt-sql/azure/mgmt/sql/operations/restore_points_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-sql/azure/mgmt/sql/operations/restore_points_operations.py
Auto-merging azure-mgmt-sql/azure/mgmt/sql/operations/__init__.py
Auto-merging azure-mgmt-sql/azure/mgmt/sql/models/__init__.py
CONFLICT (rename/rename): Rename "azure-mgmt-sql/azure/mgmt/sql/models/database_restore_point_paged.py"->"azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/models/database_account_paged.py" in branch "ff441dd8999faa9140f65af48635a4de644753f7" rename "azure-mgmt-sql/azure/mgmt/sql/models/database_restore_point_paged.py"->"azure-mgmt-sql/azure/mgmt/sql/models/job_agent_paged.py" in "Generated from 00c10e2add6a8d8d5c0cd8c28f8f6f09a3dde3b8"
Patch failed at 0001 Generated from 00c10e2add6a8d8d5c0cd8c28f8f6f09a3dde3b8
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.' |
Delete and recreate PR |
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#2352