Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch '2.1.x'

Conflicts:
	build.gradle
	build.properties
	grails-resources/src/grails/grails-app/conf/BuildConfig.groovy
	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java
  • Loading branch information...
commit e50640ba8192907992562553fe014db564867c8b 2 parents 0ef0dad + 814e3f1
@jeffbrown jeffbrown authored
View
2  grails-resources/src/grails/grails-app/conf/BuildConfig.groovy
@@ -51,6 +51,6 @@ grails.project.dependency.resolution = {
runtime ":database-migration:1.1"
- compile ':cache:1.0.0.BUILD-SNAPSHOT'
+ compile ':cache:1.0.0.RC1'
}
}
View
2  grails-resources/src/grails/templates/maven/app.pom
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.grails.plugins</groupId>
<artifactId>cache</artifactId>
- <version>1.0.0.M2</version>
+ <version>1.0.0.RC1</version>
<type>zip</type>
<scope>compile</scope>
</dependency>
Please sign in to comment.
Something went wrong with that request. Please try again.