Skip to content
Browse files

Merge branch '2.1.x'

Conflicts:
	build.gradle
	gradle/wrapper/gradle-wrapper.properties
  • Loading branch information...
2 parents 5070251 + 04374d7 commit df8d6cf6cf34e08601d525fcdcb8323f01c18255 @jeffbrown jeffbrown committed
Showing with 4 additions and 4 deletions.
  1. +1 −1 build.gradle
  2. +2 −2 gradle/wrapper/gradle-wrapper.properties
  3. +1 −1 gradlew
View
2 build.gradle
@@ -331,7 +331,7 @@ apply {
}
task wrapper(type: Wrapper) {
- gradleVersion = '1.0'
+ gradleVersion = '1.1-rc-1'
jarFile = 'gradle/wrapper/gradle-wrapper.jar'
}
View
4 gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jun 12 05:40:55 CDT 2012
+#Wed Jul 25 18:35:48 CDT 2012
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.1-rc-1-bin.zip
View
2 gradlew
@@ -101,7 +101,7 @@ if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
- warn "Could not query businessSystem maximum file descriptor limit: $MAX_FD_LIMIT"
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi

0 comments on commit df8d6cf

Please sign in to comment.
Something went wrong with that request. Please try again.