Merge branch 'release/0.5.0' into develop

twitter · Apr 25, 2012 · 2217189 · 2217189
2 parents 12e9693 + 4ec6a75
commit 2217189
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,9 +1,18 @@
 # Scalding #
 
+### Versions 0.5.0 ###
+* ISSUE 67: Upgrade cascading to wip-281.
+* ISSUE 66: Allow default time zone in DefaultDateRangeJob.
+* ISSUE 65: Fixed the error message thrown by FileSource.validateTaps.
+* ISSUE 62: Kryo Upgrade to 2.04
+* ISSUE 60: Feature/abstract algebra
+* ISSUE 52: Feature/cogroup builder
+* ISSUE 51: Feature/headfix
+
 ### Version 0.4.1 ###
-* ISSUE 42 Feature/iterable source
-* ISSUE 41 Adds blockJoinWithSmaller to JoinAlgorithms.
-* ISSUE 39 Adding default value to pivot
+* ISSUE 42: Feature/iterable source
+* ISSUE 41: Adds blockJoinWithSmaller to JoinAlgorithms.
+* ISSUE 39: Adding default value to pivot
 
 ### Version 0.4.0 ###
 * ISSUE 38: Fix bug with hash code collisions of Source objects

diff --git a/README.md b/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.4.1
+Current version: 0.5.0
 
 ## Word Count
 
@@ -20,12 +20,12 @@ class WordCountJob(args : Args) extends Job(args) {
     .flatMap('line -> 'word) { line : String => tokenize(line) }
     .groupBy('word) { _.size }
     .write( Tsv( args("output") ) )
-    
+
   // Split a piece of text into individual words.
   def tokenize(text : String) : Array[String] = {
     // Lowercase each word and remove punctuation.
     text.toLowerCase.replaceAll("[^a-zA-Z0-9\\s]", "").split("\\s+")
-  }    
+  }
 }
 ```
 
@@ -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.4.1 and is available from maven central: org="com.twitter",
+The current version is 0.5.0 and is available from maven central: org="com.twitter",
 artifact="scalding_2.8.1" or artifact="scalding_2.9.1".
 
 ## Contact

diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ import AssemblyKeys._
 
 name := "scalding"
 
-version := "0.4.1"
+version := "0.5.0"
 
 organization := "com.twitter"
 

diff --git a/scripts/scald.rb b/scripts/scald.rb
@@ -2,7 +2,7 @@
 require 'fileutils'
 require 'thread'
 
-SCALDING_VERSION="0.4.1"
+SCALDING_VERSION="0.5.0"
 
 #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.