Merge branch '3.1.x' into 3.2.x

jameskleeh · jameskleeh · commit a832497baf12 · 2016-12-07T15:34:54.000-05:00
diff --git a/grails-core/src/main/groovy/grails/plugins/DefaultGrailsPluginManager.java b/grails-core/src/main/groovy/grails/plugins/DefaultGrailsPluginManager.java
@@ -462,7 +462,7 @@ private void loadDelayedPlugins() {
                 }
                 else {
                     failedPlugins.put(plugin.getName(), plugin);
-                    LOG.warn("WARNING: Plugin [" + plugin.getName() + "] cannot be loaded because its dependencies [" +
+                    LOG.error("ERROR: Plugin [" + plugin.getName() + "] cannot be loaded because its dependencies [" +
                             DefaultGroovyMethods.inspect(plugin.getDependencyNames()) + "] cannot be resolved");
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,7 @@ private void loadDelayedPlugins() {`
`462`	`462`	`}`
`463`	`463`	`else {`
`464`	`464`	`failedPlugins.put(plugin.getName(), plugin);`
`465`		`- LOG.warn("WARNING: Plugin [" + plugin.getName() + "] cannot be loaded because its dependencies [" +`
	`465`	`+ LOG.error("ERROR: Plugin [" + plugin.getName() + "] cannot be loaded because its dependencies [" +`
`466`	`466`	`DefaultGroovyMethods.inspect(plugin.getDependencyNames()) + "] cannot be resolved");`
`467`	`467`	`}`
`468`	`468`	`}`