Merge upstream into 203 #357
Assignees
Milestone
Comments
sdubov
added a commit
that referenced
this issue
Nov 19, 2020
…nto 203-sdubov-#357 � Conflicts: � PluginsAndFeatures/azure-toolkit-for-intellij/.idea/misc.xml � PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle � PluginsAndFeatures/azure-toolkit-for-intellij/idea/resources/META-INF/plugin.xml � PluginsAndFeatures/azure-toolkit-for-intellij/idea/src/com/microsoft/intellij/actions/ApplicatioInsightsAction.java � PluginsAndFeatures/azure-toolkit-for-intellij/idea/src/com/microsoft/intellij/runner/functions/deploy/ui/creation/FunctionCreationDialog.form � PluginsAndFeatures/azure-toolkit-for-intellij/idea/src/com/microsoft/intellij/runner/functions/deploy/ui/creation/FunctionCreationDialog.java � PluginsAndFeatures/azure-toolkit-for-intellij/idea/src/com/microsoft/intellij/runner/webapp/webappconfig/ui/WebAppDeployMvpView.java � PluginsAndFeatures/azure-toolkit-for-intellij/idea/src/com/microsoft/intellij/runner/webapp/webappconfig/ui/WebAppDeployViewPresenter.java � PluginsAndFeatures/azure-toolkit-for-intellij/idea/src/com/microsoft/intellij/runner/webapp/webappconfig/ui/WebAppSettingPanel.form � PluginsAndFeatures/azure-toolkit-for-intellij/idea/src/com/microsoft/intellij/runner/webapp/webappconfig/ui/WebAppSettingPanel.java � PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/lib/common/utils/publish/forms/CalculateDockerDeletionSafenessBackgroundTask.java � PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/AzurePlugin.java � PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/actions/ApplicatioInsightsAction.java � PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/actions/ApplicationInsightsAction.java � PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/actions/AzureDockerHostDeployAction.java � PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/components/ServerExplorerToolWindowFactory.java � PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/deploy/AzureDeploymentProgressNotification.java � PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/docker/dialogs/AzureViewDockerDialog.java � PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/docker/utils/AzureDockerUIResources.java � PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/docker/wizards/createhost/AzureNewDockerWizardDialog.java � PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/docker/wizards/publish/forms/AzureSelectDockerHostStep.java � PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/helpers/IDEHelperImpl.java � PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/serviceexplorer/NodeActionsMap.java � PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/serviceexplorer/azure/docker/CreateNewDockerHostAction.java � PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/serviceexplorer/azure/docker/DeleteDockerHostAction.java � PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/serviceexplorer/azure/docker/ViewDockerHostAction.java � Utils/azure-explorer-common/pom.xml � Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/AzureModule.java � Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/arm/ResourceManagementModule.java � Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/docker/DockerContainerNode.java � Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/docker/DockerHostModule.java � Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/docker/DockerHostNode.java � Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/docker/DockerImageNode.java � Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/storage/StorageModule.java � Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/vmarm/VMNode.java � Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/webapp/WebAppModule.java � Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/webapp/WebAppNode.java � Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/webapp/base/WebAppBaseNode.java � Utils/azuretools-core/pom.xml
This was referenced Dec 4, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
az loginin Managed Identity? #204 (comment)The text was updated successfully, but these errors were encountered: