Skip to content

Conversation

@AutorestCI
Copy link
Contributor

…l.core.json (#1829)

* Generated from 5a6fe19cfbfc33daf461404f3e77978e398bec49

Extract checkNameAvailability.json from sql.core.json

* Generated from b1f5dd6f842a458a6c117a2a5da68a7f5d895d77

Fixed cross-file references

* Update version.py
@codecov-io
Copy link

codecov-io commented Feb 16, 2018

Codecov Report

Merging #1997 into restapi_auto_sql/resource-manager will increase coverage by 0.65%.
The diff coverage is 50.45%.

Impacted file tree graph

@@                          Coverage Diff                          @@
##           restapi_auto_sql/resource-manager    #1997      +/-   ##
=====================================================================
+ Coverage                               52.2%   52.85%   +0.65%     
=====================================================================
  Files                                   4740     4705      -35     
  Lines                                 121548   116715    -4833     
=====================================================================
- Hits                                   63453    61692    -1761     
+ Misses                                 58095    55023    -3072
Impacted Files Coverage Δ
...re/mgmt/sql/operations/server_usages_operations.py 94.11% <100%> (+0.17%) ⬆️
...e-mgmt-sql/azure/mgmt/sql/sql_management_client.py 100% <100%> (ø) ⬆️
...ure-mgmt-sql/azure/mgmt/sql/operations/__init__.py 100% <100%> (ø) ⬆️
.../mgmt/sql/operations/database_usages_operations.py 94.11% <100%> (+0.17%) ⬆️
azure-mgmt-sql/azure/mgmt/sql/models/__init__.py 100% <100%> (ø) ⬆️
...e/mgmt/sql/operations/restore_points_operations.py 22.82% <33.33%> (ø)
.../azure/mgmt/sql/operations/databases_operations.py 29.12% <38.7%> (+1.54%) ⬆️
...s/database_threat_detection_policies_operations.py 31.48% <50%> (+2.63%) ⬆️
...gmt/sql/operations/replication_links_operations.py 20.96% <50%> (+3.32%) ⬆️
...sql/operations/data_masking_policies_operations.py 32.07% <50%> (+2.66%) ⬆️
... and 307 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fdf5a43...f1556d9. Read the comment docs.

@lmazuel
Copy link
Member

lmazuel commented Mar 9, 2018

@AutorestCI rebase

@AutorestCI
Copy link
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_sql/resource-manager
  stdout: 'First, rewinding head to replay your work on top of it...
Applying: Generated from f80af837ce51f6b5a189b61f12b4eca87208822b
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
CONFLICT (content): Merge conflict in azure-mgmt-sql/azure/mgmt/sql/sql_management_client.py
CONFLICT (rename/delete): azure-mgmt-sql/azure/mgmt/sql/operations/restore_points_operations.py deleted in Generated from f80af837ce51f6b5a189b61f12b4eca87208822b and renamed in ff441dd8999faa9140f65af48635a4de644753f7. Version ff441dd8999faa9140f65af48635a4de644753f7 of azure-mgmt-sql/azure/mgmt/sql/operations/restore_points_operations.py left in tree.
Auto-merging azure-mgmt-sql/azure/mgmt/sql/operations/databases_operations.py
Auto-merging azure-mgmt-sql/azure/mgmt/sql/operations/__init__.py
CONFLICT (content): Merge conflict in azure-mgmt-sql/azure/mgmt/sql/operations/__init__.py
Auto-merging azure-mgmt-sql/azure/mgmt/sql/models/restore_point.py
CONFLICT (content): Merge conflict in azure-mgmt-sql/azure/mgmt/sql/models/restore_point.py
Removing azure-mgmt-sql/azure/mgmt/sql/models/create_database_restore_point_definition.py
Auto-merging azure-mgmt-sql/azure/mgmt/sql/models/__init__.py
CONFLICT (content): Merge conflict in 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/restore_point_paged.py" in "Generated from f80af837ce51f6b5a189b61f12b4eca87208822b"
Patch failed at 0001 Generated from f80af837ce51f6b5a189b61f12b4eca87208822b
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.'

@lmazuel
Copy link
Member

lmazuel commented Mar 9, 2018

Delete and recreate PR

@lmazuel lmazuel closed this Mar 9, 2018
@lmazuel lmazuel deleted the restapi_auto_2426 branch March 9, 2018 00:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants