Skip to content
Browse files

Merge branch 'release/0.5.2' into develop

  • Loading branch information...
2 parents f16210a + 595a48d commit 36f2d327574ed232b7d5f2c88ba2e4bf15ad8c80 @azymnis azymnis committed May 4, 2012
Showing with 7 additions and 4 deletions.
  1. +3 −0 CHANGES.md
  2. +2 −2 README.md
  3. +1 −1 build.sbt
  4. +1 −1 scripts/scald.rb
View
3 CHANGES.md
@@ -1,5 +1,8 @@
# Scalding #
+### Version 0.5.2 ###
+* ISSUE 74: Upgrade cascading to wip-291 and maple to 0.1.7
+
### Version 0.5.1 ###
* ISSUE 73: Feature/comparator prop
* ISSUE 72: Upgrade to cascading wip-288 and maple 0.1.5
View
4 README.md
@@ -4,7 +4,7 @@ Scalding is a Scala library that makes it easy to write MapReduce jobs in Hadoop
Scalding is built on top of [Cascading](http://www.cascading.org/), a Java library that abstracts away much of the complexity of Hadoop.
-Current version: 0.5.1
+Current version: 0.5.2
## Word Count
@@ -49,7 +49,7 @@ You can find more example code under [examples/](https://github.com/twitter/scal
We use [Travis CI](http://travis-ci.org/) to verify the build:
[![Build Status](https://secure.travis-ci.org/twitter/scalding.png)](http://travis-ci.org/twitter/scalding)
-The current version is 0.5.1 and is available from maven central: org="com.twitter",
+The current version is 0.5.2 and is available from maven central: org="com.twitter",
artifact="scalding_2.8.1" or artifact="scalding_2.9.1".
## Contact
View
2 build.sbt
@@ -2,7 +2,7 @@ import AssemblyKeys._
name := "scalding"
-version := "0.5.1"
+version := "0.5.2"
organization := "com.twitter"
View
2 scripts/scald.rb
@@ -2,7 +2,7 @@
require 'fileutils'
require 'thread'
-SCALDING_VERSION="0.5.1"
+SCALDING_VERSION="0.5.2"
#Usage : scald.rb [--hdfs|--local|--print] job <job args>
# --hdfs: if job ends in ".scala" or ".java" and the file exists, link it against JARFILE (below) and then run it on HOST.

0 comments on commit 36f2d32

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