Merge remote-tracking branch 'origin/master' into IDEA-CR-10038
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Tue, 10 May 2016 09:20:00 +0000 (11:20 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Tue, 10 May 2016 09:20:00 +0000 (11:20 +0200)
# Conflicts:
# platform/platform-resources-en/src/messages/IdeBundle.properties

1  2 
java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
platform/platform-resources-en/src/messages/IdeBundle.properties
platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml
platform/util/resources/misc/registry.properties
plugins/git4idea/rt/src/org/jetbrains/git4idea/ssh/GitSSHHandler.java
plugins/git4idea/src/git4idea/commands/GitHttpAuthService.java

index ef95a23df1ed5817e4afe4d13fcbb463d303adc9,100e3ea7b7640dd9c7ddc3c0951cd3e599a56989..352becb8cf35362bb678896781bccbd324f9453d
@@@ -1197,5 -1197,4 +1197,7 @@@ title.load.project.from.share=Loading P
  warning.load.file.from.share=You are opening a file from a network share. Do you want to continue?\n{0}
  title.load.file.from.share=Loading File From Network
  
 -change.color.command.text=Change color
++change.color.command.text=Change color
++
 +warning.use.rest.api=''{0}'' API is requested. Do you trust ''{1}''?
 +title.use.rest.api=Using REST API
index 4ce4ea31b6a25d87152f1ed7aa28e7ab1f028839,810d4e70411582550bb182d2981c97bc8cd78dc6..0feebcbb0cf8ee08ab74bf28c9dda37bf32f5018
@@@ -27,12 -27,18 +27,12 @@@ public interface GitSSHHandler 
    /**
     * The prefix of the ssh script name
     */
-   @NonNls String GIT_SSH_PREFIX = "git-ssh-";
+   @NonNls String GIT_SSH_PREFIX = "intellij-git-ssh";
    /**
 -   * Name of environment variable for SSH handler number
 +   * Name of environment variable for SSH handler access token
     */
    @NonNls String SSH_HANDLER_ENV = "GIT4IDEA_SSH_HANDLER";
 -  /**
 -   * Name of environment variable for SSH handler number
 -   */
    @NonNls String SSH_IGNORE_KNOWN_HOSTS_ENV = "GIT4IDEA_SSH_IGNORE_KNOWN_HOSTS";
 -  /**
 -   * Name of environment variable for SSH handler
 -   */
    @NonNls String SSH_PORT_ENV = "GIT4IDEA_SSH_PORT";
    /**
     * Name of environment variable for SSH executable