Permalink
Browse files

Merge pull request #93 from benpastel/develop

Bump cascading to 2.0.3
  • Loading branch information...
sritchie committed Aug 18, 2012
2 parents 9f9f5d5 + 4b9080e commit 9ec133012cd3667fb6d91a9170f3ac624585cc9b
Showing with 5 additions and 3 deletions.
  1. +1 −1 project.clj
  2. +4 −2 src/clj/cascalog/testing.clj
View
@@ -1,6 +1,6 @@
(def shared
'[[org.clojure/tools.macro "0.1.1"]
- [cascading/cascading-hadoop "2.0.0"
+ [cascading/cascading-hadoop "2.0.3"
:exclusions [org.codehaus.janino/janino
org.apache.hadoop/hadoop-core]]
[org.clojure/tools.macro "0.1.1"]
@@ -23,8 +23,10 @@
[java.io File]))
(defn roundtrip [obj]
- (HadoopUtil/deserializeBase64
- (HadoopUtil/serializeBase64 obj)))
+ (let [conf (hadoop/job-conf (conf/project-conf))]
+ (HadoopUtil/deserializeBase64
+ (HadoopUtil/serializeBase64 obj conf true)
+ conf (class obj) true)))
(defn invoke-filter [fil coll]
(let [fil (roundtrip fil)

0 comments on commit 9ec1330

Please sign in to comment.