Skip to content
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 compute/resource-manager] added missing Swagger #2024

Closed

Conversation

AutorestCI
Copy link
Contributor

AutorestCI and others added 6 commits February 21, 2018 19:59
… and a new WriteAaccelerator property on disks (#1803)

* Generated from 9f531093070b99b48e5f7de8113ec6244610add9

Updated spec to include properties in VMInstanceView and a new WriteAccelerator property on disks

* Generated from 83cfb6cd50b9ebc03687c8505da6c050dcbb674a

Resolved PR comment

* Generated from d18451865a038ceb07f09b309de92bd004bd27e8

VirtualMachineInstanceView  is ReadOnly, so ReadOnly is not required on individual properties
* Generated from 02702702645f7e64ae63f4b6016bcc966f8513d9

Adding 6.1 tag to readme

* Generated from ef99ca24deaaecb3fdb6d1587617a98805cdd61b

Dropping 4th digit from version number for clarity

* Generated from c0dcfcd2e00ac0ac516d28ff343d1f1d40b3d45b

Update readme.md

* updating history to reflect new version

* azure-servicefabric 6.1.2.9

* Restapi auto areddish custom vision swagger (#1771)

* Generated from 0d4e675c639f9fe784946e2267223c132b266fcf

Add automatic Python conf for Custom Vision Prediction

* Generated from 049c2dd356adb296c9c28386207b66cd48781467

Add automatic Python conf to Custom Vision Training

* Generated from 599b21132b4678729ebe24ad4a60439fbf57047c

Fix Prediction Examples

* Generated from disks (#1835) - doc only

added image examples to 2017-12-01

* Restapi auto v sodsou content moderator v2 (#1861)

* Generated from b594737f845e43b28bd77878820b39f8543650d1

Revert version changes

* Generated from d18cc9d65430a8e1a1c3af522db42cbdbdcfe819

Missing Python version

* Generated from 8eb897fbdd6a4dcd68621f9ae311447d478a2ced

Adding LogAnalytics to comptue spec and also including previously missing VM sizes.

* Generated from 03fbec7ef3885d93b5ee939eff0e9de9d4ef0185

Adding response type models in swagger and example files.

* Generated from 2ff7912f1a75581dd595bd47c2cb290d71e9d31e

Updating LogAnalyticsOperationResult to inherit from OperationStatusResponse.

* Generated from 5f2d9322e0bd866cf2bb55bca4bca75d4c799371

Updating example files.
…UpdateDomainWalk (#1870)

* Generated from 02702702645f7e64ae63f4b6016bcc966f8513d9

Adding 6.1 tag to readme

* Generated from ef99ca24deaaecb3fdb6d1587617a98805cdd61b

Dropping 4th digit from version number for clarity

* Generated from c0dcfcd2e00ac0ac516d28ff343d1f1d40b3d45b

Update readme.md

* updating history to reflect new version

* azure-servicefabric 6.1.2.9

* Restapi auto areddish custom vision swagger (#1771)

* Generated from 0d4e675c639f9fe784946e2267223c132b266fcf

Add automatic Python conf for Custom Vision Prediction

* Generated from 049c2dd356adb296c9c28386207b66cd48781467

Add automatic Python conf to Custom Vision Training

* Generated from 599b21132b4678729ebe24ad4a60439fbf57047c

Fix Prediction Examples

* Generated from disks (#1835) - doc only

added image examples to 2017-12-01

* Restapi auto v sodsou content moderator v2 (#1861)

* Generated from b594737f845e43b28bd77878820b39f8543650d1

Revert version changes

* Generated from d18cc9d65430a8e1a1c3af522db42cbdbdcfe819

Missing Python version

* Generated from 9787c7c2b73d0b3ed91ba60d44acd9eb641c4277

Adding new API for VMSS: ForceRecoveryServiceFabricPlatformUpdateDomainWalk
removed invalid 'required' properties
@codecov-io
Copy link

codecov-io commented Feb 21, 2018

Codecov Report

Merging #2024 into restapi_auto_compute/resource-manager will increase coverage by 0.02%.
The diff coverage is 47.29%.

Impacted file tree graph

@@                            Coverage Diff                            @@
##           restapi_auto_compute/resource-manager    #2024      +/-   ##
=========================================================================
+ Coverage                                  53.06%   53.08%   +0.02%     
=========================================================================
  Files                                       4779     4785       +6     
  Lines                                     119693   120059     +366     
=========================================================================
+ Hits                                       63510    63730     +220     
- Misses                                     56183    56329     +146
Impacted Files Coverage Δ
...gmt/compute/v2017_12_01/models/hardware_profile.py 100% <ø> (ø) ⬆️
.../azure/mgmt/compute/v2017_12_01/models/__init__.py 100% <100%> (ø) ⬆️
...compute/v2017_12_01/operations/usage_operations.py 94.11% <100%> (+0.17%) ⬆️
...01/operations/virtual_machine_images_operations.py 97.34% <100%> (+0.12%) ⬆️
..._01/operations/virtual_machine_sizes_operations.py 94.11% <100%> (+0.17%) ⬆️
...perations/virtual_machine_extensions_operations.py 95.19% <100%> (+0.14%) ⬆️
...re/mgmt/compute/v2017_12_01/operations/__init__.py 100% <100%> (ø) ⬆️
...ons/virtual_machine_extension_images_operations.py 96% <100%> (+0.16%) ⬆️
...te/azure/mgmt/compute/compute_management_client.py 56.14% <16.66%> (-1%) ⬇️
...ompute/v2017_12_01/operations/images_operations.py 32.6% <19.56%> (-3.76%) ⬇️
... and 37 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 3d895e9...9aaf988. Read the comment docs.

@AutorestCI AutorestCI force-pushed the restapi_auto_compute/resource-manager branch from 26e6c12 to 1aa0684 Compare February 28, 2018 18:23
@lmazuel lmazuel force-pushed the restapi_auto_compute/resource-manager branch from e1cc878 to 89a9975 Compare March 9, 2018 19:59
@lmazuel
Copy link
Member

lmazuel commented Mar 13, 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_compute/resource-manager
  stdout: 'First, rewinding head to replay your work on top of it...
Applying: Generated from d8bed835a4d9b651f6171b7d731dcff1fa75cc92
Using index info to reconstruct a base tree...
M	azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/availability_sets_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/usage_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_extension_images_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_extensions_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_images_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_scale_set_vms_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_scale_sets_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_sizes_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machines_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/availability_sets_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/usage_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_extension_images_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_extensions_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_images_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_scale_set_vms_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_scale_sets_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_sizes_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machines_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/availability_sets_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/disks_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/images_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/snapshots_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/usage_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_extension_images_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_extensions_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_images_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_scale_set_vms_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_scale_sets_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_sizes_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machines_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/availability_sets_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/disks_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/images_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/resource_skus_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/snapshots_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/usage_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_extension_images_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_extensions_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_images_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_run_commands_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_set_extensions_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_set_vms_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_sets_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_sizes_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machines_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_09_01/operations/resource_skus_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/__init__.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/hardware_profile.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/availability_sets_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/images_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/log_analytics_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/usage_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_extension_images_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_extensions_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_images_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_run_commands_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_set_extensions_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_set_vms_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_sets_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_sizes_operations.py
M	azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machines_operations.py
Falling back to patching base and 3-way merge...
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machines_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machines_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_sets_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_sets_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_set_vms_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_set_vms_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_set_extensions_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_set_extensions_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_extensions_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_extensions_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/log_analytics_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/log_analytics_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/images_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/images_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/availability_sets_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/availability_sets_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/hardware_profile.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/__init__.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/__init__.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machines_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machines_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_sets_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_sets_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_set_vms_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_set_vms_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_set_extensions_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_set_extensions_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_extensions_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_extensions_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/snapshots_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/snapshots_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/images_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/images_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/disks_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/disks_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machines_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machines_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_scale_sets_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_scale_sets_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_scale_set_vms_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_scale_set_vms_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_extensions_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_extensions_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/snapshots_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/snapshots_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/images_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/images_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/disks_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/disks_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machines_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machines_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_scale_sets_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_scale_sets_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_scale_set_vms_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_scale_set_vms_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_extensions_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_extensions_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machines_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machines_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_scale_sets_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_scale_sets_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_scale_set_vms_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_scale_set_vms_operations.py
Auto-merging azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_extensions_operations.py
CONFLICT (content): Merge conflict in azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_extensions_operations.py
Patch failed at 0001 Generated from d8bed835a4d9b651f6171b7d731dcff1fa75cc92
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 13, 2018

Dead PR, let's close and refresh

@lmazuel lmazuel closed this Mar 13, 2018
@lmazuel lmazuel deleted the restapi_auto_2428 branch March 13, 2018 23:15
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.

3 participants