Merge branch 'topic/docker_python'
authorAlexander Koshevoy <Alexander.Koshevoy@jetbrains.com>
Fri, 5 Feb 2016 14:53:34 +0000 (17:53 +0300)
committerAlexander Koshevoy <Alexander.Koshevoy@jetbrains.com>
Fri, 5 Feb 2016 14:53:34 +0000 (17:53 +0300)
Conflicts:
platform/platform-impl/src/com/intellij/remote/RemoteConnectionCredentialsWrapper.java

1  2 
platform/platform-resources/src/META-INF/PlatformExtensions.xml

index b3756cce7999ef204822ea436b73df0c7393444b,898daf57d275034c0eec57ffbdfec1ef75dea45a..b74c054bfd5d33344ae0dfbf6fa326c3ebded7f3
@@@ -25,6 -25,9 +25,6 @@@
      <applicationService serviceInterface="com.intellij.openapi.vfs.tracker.VirtualFileTracker"
                          serviceImplementation="com.intellij.openapi.vfs.tracker.VirtualFileTrackerImpl"/>
  
 -    <applicationService serviceInterface="com.intellij.concurrency.JobScheduler"
 -                        serviceImplementation="com.intellij.concurrency.JobSchedulerImpl"/>
 -
      <applicationService serviceInterface="com.intellij.openapi.options.ShowSettingsUtil"
                          serviceImplementation="com.intellij.ide.actions.ShowSettingsUtilImpl"/>
      <applicationService serviceInterface="com.intellij.openapi.help.HelpManager"
                           displayName="Startup Tasks"
                           id="preferences.startup.tasks" nonDefaultProject="true"/>
      <postStartupActivity implementation="com.intellij.execution.startup.ProjectStartupRunner"/>
+     <applicationService serviceInterface="com.intellij.remote.ext.CredentialsManager"
+                         serviceImplementation="com.intellij.remote.ext.CredentialsManagerImpl"/>
    </extensions>
  </idea-plugin>