Merge branch '2.3.x' into 2.4.x

lhotari · lhotari · commit 09ada826771f · 2014-10-28T13:10:40.000+02:00
Conflicts:
	grails-resources/src/grails/grails-app/conf/BuildConfig.groovy
diff --git a/grails-resources/src/grails/grails-app/conf/BuildConfig.groovy b/grails-resources/src/grails/grails-app/conf/BuildConfig.groovy
@@ -50,7 +50,7 @@ grails.project.dependency.resolution = {
         // specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes e.g.
         // runtime 'mysql:mysql-connector-java:5.1.29'
         // runtime 'org.postgresql:postgresql:9.3-1101-jdbc41'
-        test "org.grails:grails-datastore-test-support:1.0.1-grails-2.4"
+        test "org.grails:grails-datastore-test-support:1.0.2-grails-2.4"
     }
 
     plugins {

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ grails.project.dependency.resolution = {`
`50`	`50`	`// specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes e.g.`
`51`	`51`	`// runtime 'mysql:mysql-connector-java:5.1.29'`
`52`	`52`	`// runtime 'org.postgresql:postgresql:9.3-1101-jdbc41'`
`53`		`- test "org.grails:grails-datastore-test-support:1.0.1-grails-2.4"`
	`53`	`+ test "org.grails:grails-datastore-test-support:1.0.2-grails-2.4"`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`plugins {`