Skip to content

Commit 8ffdc25

Browse files
committed
Merge branch 'qianjin-sqlserver' into qianjin-sqlserver-refactor
# Conflicts: # PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/mysql/MySQLPropertyView.java
2 parents 4bb3fcf + 56dce6f commit 8ffdc25

File tree

117 files changed

+1389
-3696
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+1389
-3696
lines changed

PluginsAndFeatures/azure-toolkit-for-intellij/Test/java/com/microsoft/intellij/runner/webapp/WebAppIntegrationTest.java

Lines changed: 0 additions & 327 deletions
This file was deleted.

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/preload/AzurePreloadingActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public class AzurePreloadingActivity extends PreloadingActivity {
1717
@Override
1818
public void preload(@org.jetbrains.annotations.NotNull final ProgressIndicator indicator) {
1919
// Using progress manager as azure task manager is not initialized
20-
ApplicationManager.getApplication().executeOnPooledThread(Preloader::load);
20+
// TODO: remove this comment
21+
// ApplicationManager.getApplication().executeOnPooledThread(Preloader::load);
2122
}
2223
}

0 commit comments

Comments
 (0)