[AutoPR] restapi_auto_datafactory/resource-manager

[lmazuel]

No description provided.

[codecov-io]

Codecov Report

Merging #1972 into master will decrease coverage by 0.44%.
The diff coverage is 62.74%.

@@            Coverage Diff             @@
##           master    #1972      +/-   ##
==========================================
- Coverage   53.14%   52.69%   -0.45%     
==========================================
  Files        4732     4763      +31     
  Lines      117638   120903    +3265     
==========================================
+ Hits        62515    63712    +1197     
- Misses      55123    57191    +2068

Impacted Files	Coverage Δ
...ctory/models/managed_integration_runtime_status.py	45.45% <ø> (ø)	⬆️
...t/datafactory/models/azure_batch_linked_service.py	38.46% <ø> (ø)	⬆️
...gmt/datafactory/models/web_basic_authentication.py	55.55% <ø> (ø)	⬆️
...tory/models/hd_insight_on_demand_linked_service.py	14.7% <ø> (ø)	⬆️
...ctory/azure/mgmt/datafactory/models/copy_source.py	100% <ø> (ø)	⬆️
...ry/models/web_client_certificate_authentication.py	55.55% <ø> (ø)	⬆️
...tafactory/azure/mgmt/datafactory/models/dataset.py	100% <ø> (ø)	⬆️
...ure/mgmt/datafactory/models/hive_linked_service.py	20.83% <ø> (ø)	⬆️
...ry/azure/mgmt/datafactory/models/linked_service.py	100% <ø> (ø)	⬆️
...mt/datafactory/models/hd_insight_linked_service.py	38.46% <ø> (ø)	⬆️
... and 110 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 7bdda72...fea435f. Read the comment docs.

[hvermis]

Is this supposed to be like this? The changes look good, and I will update the version later separately unless the scripts have changed and now we put API version here.

[lmazuel]

Nope, this has to be the package version. This info should be in your Readme.md file. If you have more Swagger PR to do, use one of them to update the Python conf to add package-version: 0.4.1 (or whatever the good value). If you don't have, no big deal we will change this one just before merging.

[hvermis]

We might have on more, still waiting on that one.

[lmazuel]

@AutorestCI rebase

[AutorestCI]

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 108, 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/master
  stdout: 'First, rewinding head to replay your work on top of it...
Applying: ADF after https://github.com/Azure/azure-rest-api-specs/pull/2473
Applying: Updating the version for ADF to 0.5.0 (#2002)
Using index info to reconstruct a base tree...
M	azure-mgmt-advisor/HISTORY.rst
M	azure-mgmt-advisor/azure/mgmt/advisor/models/__init__.py
A	azure-mgmt-advisor/azure/mgmt/advisor/models/configuration_list_result.py
M	azure-mgmt-advisor/azure/mgmt/advisor/operations/configurations_operations.py
M	azure-mgmt-advisor/azure/mgmt/advisor/version.py
M	azure-mgmt-advisor/tests/test_mgmt_advisor.py
M	azure-mgmt-datalake-analytics/HISTORY.rst
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/data_lake_analytics_account_management_client.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/__init__.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/add_data_lake_store_parameters.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/add_storage_account_parameters.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/capability_information.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/check_name_availability_parameters.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/compute_policy.py
A	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/compute_policy_account_create_parameters.py
A	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/compute_policy_create_or_update_parameters.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/data_lake_analytics_account.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/data_lake_analytics_account_basic.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/data_lake_analytics_account_management_client_enums.py
A	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/data_lake_analytics_account_properties_basic.py
A	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/data_lake_analytics_account_update_parameters.py
A	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/data_lake_store_account_info.py
A	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/data_lake_store_account_info_paged.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/firewall_rule.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/name_availability_information.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/operation.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/operation_display.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/operation_list_result.py
A	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/optional_sub_resource.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/resource.py
A	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/sas_token_info.py
A	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/sas_token_info_paged.py
A	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/storage_account_info.py
A	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/storage_account_info_paged.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/storage_container.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/sub_resource.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/update_firewall_rule_parameters.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/update_storage_account_parameters.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/operations/__init__.py
A	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/operations/account_operations.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/operations/compute_policies_operations.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/operations/data_lake_store_accounts_operations.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/operations/firewall_rules_operations.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/operations/locations_operations.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/operations/storage_accounts_operations.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/catalog/models/__init__.py
A	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/catalog/models/acl_list.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/catalog/operations/catalog_operations.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/job/data_lake_analytics_job_management_client.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/job/models/__init__.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/job/operations/__init__.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/job/operations/job_operations.py
M	azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/version.py
M	azure-mgmt-datalake-store/HISTORY.rst
M	azure-mgmt-datalake-store/azure/mgmt/datalake/store/data_lake_store_account_management_client.py
M	azure-mgmt-datalake-store/azure/mgmt/datalake/store/models/__init__.py
M	azure-mgmt-datalake-store/azure/mgmt/datalake/store/models/capability_information.py
M	azure-mgmt-datalake-store/azure/mgmt/datalake/store/models/check_name_availability_parameters.py
M	azure-mgmt-datalake-store/azure/mgmt/datalake/store/models/data_lake_store_account.py
M	azure-mgmt-datalake-store/azure/mgmt/datalake/store/models/data_lake_store_account_basic.py
M	azure-mgmt-datalake-store/azure/mgmt/datalake/store/models/data_lake_store_account_management_client_enums.py
A	azure-mgmt-datalake-store/azure/mgmt/datalake/store/models/data_lake_store_account_update_parameters.py
A	azure-mgmt-datalake-store/azure/mgmt/datalake/store/models/error_details.py
M	azure-mgmt-datalake-store/azure/mgmt/datalake/store/models/firewall_rule.py
M	azure-mgmt-datalake-store/azure/mgmt/datalake/store/models/name_availability_information.py
M	azure-mgmt-datalake-store/azure/mgmt/datalake/store/models/operation.py
M	azure-mgmt-datalake-store/azure/mgmt/datalake/store/models/operation_display.py
M	azure-mgmt-datalake-store/azure/mgmt/datalake/store/models/operation_list_result.py
M	azure-mgmt-datalake-store/azure/mgmt/datalake/store/models/resource.py
M	azure-mgmt-datalake-store/azure/mgmt/datalake/store/models/sub_resource.py
M	azure-mgmt-datalake-store/azure/mgmt/datalake/store/models/trusted_id_provider.py
M	azure-mgmt-datalake-store/azure/mgmt/datalake/store/models/update_firewall_rule_parameters.py
M	azure-mgmt-datalake-store/azure/mgmt/datalake/store/models/update_trusted_id_provider_parameters.py
M	azure-mgmt-datalake-store/azure/mgmt/datalake/store/operations/__init__.py
A	azure-mgmt-datalake-store/azure/mgmt/datalake/store/operations/account_operations.py
M	azure-mgmt-datalake-store/azure/mgmt/datalake/store/operations/firewall_rules_operations.py
M	azure-mgmt-datalake-store/azure/mgmt/datalake/store/operations/locations_operations.py
M	azure-mgmt-datalake-store/azure/mgmt/datalake/store/operations/trusted_id_providers_operations.py
M	azure-mgmt-datalake-store/azure/mgmt/datalake/store/version.py
M	azure-mgmt-devtestlabs/HISTORY.rst
M	azure-mgmt-devtestlabs/README.rst
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/dev_test_labs_client.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/__init__.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/apply_artifacts_request.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/arm_template_info.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/arm_template_parameter_properties.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/artifact_deployment_status_properties.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/artifact_deployment_status_properties_fragment.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/artifact_install_properties.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/artifact_install_properties_fragment.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/artifact_parameter_properties.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/artifact_parameter_properties_fragment.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/attach_disk_properties.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/attach_new_data_disk_options.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/bulk_creation_parameters.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/compute_data_disk.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/compute_data_disk_fragment.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/compute_vm_instance_view_status.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/compute_vm_instance_view_status_fragment.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/compute_vm_properties.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/compute_vm_properties_fragment.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/cost_threshold_properties.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/custom_image_properties_custom.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/custom_image_properties_from_vm.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/data_disk_properties.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/day_details.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/day_details_fragment.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/detach_data_disk_properties.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/detach_disk_properties.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/environment_deployment_properties.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/evaluate_policies_properties.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/evaluate_policies_request.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/evaluate_policies_response.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/event.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/event_fragment.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/export_resource_usage_parameters.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/external_subnet.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/external_subnet_fragment.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/formula_properties_from_vm.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/gallery_image_reference.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/gallery_image_reference_fragment.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/generate_arm_template_request.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/generate_upload_uri_parameter.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/generate_upload_uri_response.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/hour_details.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/hour_details_fragment.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/identity_properties.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/inbound_nat_rule.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/inbound_nat_rule_fragment.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/lab_cost_details_properties.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/lab_cost_summary_properties.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/lab_resource_cost_properties.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/lab_vhd.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/lab_virtual_machine_creation_parameter.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/linux_os_info.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/network_interface_properties.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/network_interface_properties_fragment.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/notification_settings.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/notification_settings_fragment.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/notify_parameters.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/operation_error.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/operation_result.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/parameter_info.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/parameters_value_file_info.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/percentage_cost_threshold_properties.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/policy_set_result.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/policy_violation.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/port.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/port_fragment.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/resource.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/retarget_schedule_properties.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/shared_public_ip_address_configuration.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/shared_public_ip_address_configuration_fragment.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/shutdown_notification_content.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/subnet.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/subnet_fragment.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/subnet_override.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/subnet_override_fragment.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/subnet_shared_public_ip_address_configuration.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/subnet_shared_public_ip_address_configuration_fragment.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/target_cost_properties.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/user_identity.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/user_identity_fragment.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/user_secret_store.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/user_secret_store_fragment.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/week_details.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/week_details_fragment.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/models/windows_os_info.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/operations/__init__.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/operations/arm_templates_operations.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/operations/artifact_sources_operations.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/operations/artifacts_operations.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/operations/costs_operations.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/operations/custom_images_operations.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/operations/disks_operations.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/operations/environments_operations.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/operations/formulas_operations.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/operations/gallery_images_operations.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/operations/global_schedules_operations.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/operations/labs_operations.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/operations/notification_channels_operations.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/operations/operations.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/operations/policies_operations.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/operations/policy_sets_operations.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/operations/schedules_operations.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/operations/secrets_operations.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/operations/service_runners_operations.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/operations/users_operations.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/operations/virtual_machine_schedules_operations.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/operations/virtual_machines_operations.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/operations/virtual_networks_operations.py
M	azure-mgmt-devtestlabs/azure/mgmt/devtestlabs/version.py
A	azure-mgmt-devtestlabs/build.json
M	azure-mgmt-devtestlabs/setup.py
M	azure-mgmt/README.rst
M	azure-mgmt/setup.py
M	azure-mgmt/tests/recordings/test_mgmt_datalake_analytics.test_adla_accounts.yaml
M	azure-mgmt/tests/recordings/test_mgmt_datalake_analytics.test_adla_catalog_credentials.yaml
M	azure-mgmt/tests/recordings/test_mgmt_datalake_analytics.test_adla_catalog_items.yaml
A	azure-mgmt/tests/recordings/test_mgmt_datalake_analytics.test_adla_catalog_secret.yaml
A	azure-mgmt/tests/recordings/test_mgmt_datalake_analytics.test_adla_compute_policy.yaml
M	azure-mgmt/tests/recordings/test_mgmt_datalake_analytics.test_adla_jobs.yaml
M	azure-mgmt/tests/recordings/test_mgmt_datalake_store.test_adls_accounts.yaml
M	azure-mgmt/tests/test_mgmt_datalake_analytics.py
M	azure-mgmt/tests/test_mgmt_datalake_store.py
M	azure/README.rst
M	azure/setup.py
Falling back to patching base and 3-way merge...
CONFLICT (rename/rename): Rename "azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/storage_account_info_paged.py"->"azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/models/storage_account_paged.py" in branch "2bfe8d820abdd565c1931bad798499b2501f6956" rename "azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/storage_account_info_paged.py"->"azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/storage_account_information_paged.py" in "Updating the version for ADF to 0.5.0 (#2002)"
CONFLICT (rename/rename): Rename "azure-mgmt-advisor/azure/mgmt/advisor/models/configuration_list_result.py"->"azure-mgmt-network/azure/mgmt/network/v2016_09_01/models/effective_route_list_result.py" in branch "2bfe8d820abdd565c1931bad798499b2501f6956" rename "azure-mgmt-advisor/azure/mgmt/advisor/models/configuration_list_result.py"->"azure-mgmt-advisor/azure/mgmt/advisor/models/config_data_paged.py" in "Updating the version for ADF to 0.5.0 (#2002)"
CONFLICT (rename/rename): Rename "azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/optional_sub_resource.py"->"azure-mgmt-eventhub/azure/mgmt/eventhub/models/resource.py" in branch "2bfe8d820abdd565c1931bad798499b2501f6956" rename "azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/optional_sub_resource.py"->"azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/storage_account_information.py" in "Updating the version for ADF to 0.5.0 (#2002)"
CONFLICT (rename/rename): Rename "azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/data_lake_store_account_info_paged.py"->"azure-mgmt-datalake-store/azure/mgmt/datalake/store/models/data_lake_store_account_basic_paged.py" in branch "2bfe8d820abdd565c1931bad798499b2501f6956" rename "azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/data_lake_store_account_info_paged.py"->"azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/account/models/data_lake_store_account_information_paged.py" in "Updating the version for ADF to 0.5.0 (#2002)"
CONFLICT (rename/delete): azure-mgmt-billing/azure/mgmt/billing/models/error_details.py deleted in Updating the version for ADF to 0.5.0 (#2002) and renamed in 2bfe8d820abdd565c1931bad798499b2501f6956. Version 2bfe8d820abdd565c1931bad798499b2501f6956 of azure-mgmt-billing/azure/mgmt/billing/models/error_details.py left in tree.
CONFLICT (rename/delete): azure-mgmt-authorization/build.json deleted in Updating the version for ADF to 0.5.0 (#2002) and renamed in 2bfe8d820abdd565c1931bad798499b2501f6956. Version 2bfe8d820abdd565c1931bad798499b2501f6956 of azure-mgmt-authorization/build.json left in tree.
CONFLICT (rename/rename): Rename "azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/catalog/models/acl_list.py"->"azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/images_module.py" in branch "2bfe8d820abdd565c1931bad798499b2501f6956" rename "azure-mgmt-datalake-analytics/azure/mgmt/datalake/analytics/catalog/models/acl_list.py"->"azure-mgmt-datalake-store/azure/mgmt/datalake/store/models/create_or_update_trusted_id_provider_parameters.py" in "Updating the version for ADF to 0.5.0 (#2002)"
Patch failed at 0002 Updating the version for ADF to 0.5.0 (#2002)
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: '.git/rebase-apply/patch:28539: trailing whitespace.
                            adla_job.job_id, 
.git/rebase-apply/patch:28540: trailing whitespace.
                            adla_job.state, 
.git/rebase-apply/patch:28541: trailing whitespace.
                            adla_job.result, 
.git/rebase-apply/patch:28560: trailing whitespace.
                self.job_account_name, 
.git/rebase-apply/patch:28578: trailing whitespace.
            self.job_account_name, 
warning: squelched 14 whitespace errors
warning: 19 lines add whitespace errors.
error: Failed to merge in the changes.'

[hvermis]

ADF changes look good.