aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins CI <ci@sonarsource.com>2015-02-27 18:24:12 +0100
committerJenkins CI <ci@sonarsource.com>2015-02-27 18:24:12 +0100
commit6c2a68be94ec4c43e012a22276b24ce8c639f6c1 (patch)
tree4af5b0f730439ce7b49b8a2f567fd62964c4fd54
parentd683342a74401d5edccd16c34b96fd53975d3c79 (diff)
parent4ea0dd1c85069c253e4dbdc1b7c6e203b5beb082 (diff)
downloadsonarqube-6c2a68be94ec4c43e012a22276b24ce8c639f6c1.tar.gz
sonarqube-6c2a68be94ec4c43e012a22276b24ce8c639f6c1.zip
Automatic merge from master
* origin/master: Test internal Git merge tool
-rw-r--r--sonar-core/src/main/java/org/sonar/core/plugins/PluginClassloaders.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/sonar-core/src/main/java/org/sonar/core/plugins/PluginClassloaders.java b/sonar-core/src/main/java/org/sonar/core/plugins/PluginClassloaders.java
index 829af0cab7c..8a6b4b88ef1 100644
--- a/sonar-core/src/main/java/org/sonar/core/plugins/PluginClassloaders.java
+++ b/sonar-core/src/main/java/org/sonar/core/plugins/PluginClassloaders.java
@@ -46,7 +46,7 @@ import java.util.Map;
* <h3>IMPORTANT</h3>
* <p>
* If we have pluginA , then all classes and resources from package and subpackages of <b>org.sonar.plugins.pluginA.api</b> will be visible
- * for all other plugins even if they located in dependent library.
+ * for all other plugins even if they are located in dependent library.
* </p>
* <p/>
* <h4>Search order for {@link ClassRealm} :</h4>