Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'release/0.3.3'

  • Loading branch information...
commit 2d9d719e83b4d7ae61f23847a588ea782925cb7e 2 parents 2f66723 + e6db0db
@tbatchelli tbatchelli authored
Showing with 17 additions and 17 deletions.
  1. +7 −7 README.md
  2. +7 −7 project.clj
  3. +3 −3 src/pallet_hadoop/node.clj
View
14 README.md
@@ -37,10 +37,11 @@ between clouds involves a change of login credentials, nothing more.
To include pallet-hadoop in your project, add the following lines to
`:dev-dependencies` in your `project.clj` file:
- [pallet-hadoop "0.3.3.-beta.4"]
- [org.jclouds/jclouds-all "1.2.0"]
- [org.jclouds.driver/jclouds-jsch "1.2.2"]
- [org.jclouds.driver/jclouds-slf4j "1.2.2"]
+ [pallet-hadoop "0.3.3"]
+ [org.cloudhoist/pallet-jclouds "1.4.2"]
+ [org.jclouds/jclouds-all "1.4.2"]
+ [org.jclouds.driver/jclouds-jsch "1.4.2"]
+ [org.jclouds.driver/jclouds-slf4j "1.4.2"]
[ch.qos.logback/logback-classic "1.0.1"]
[ch.qos.logback/logback-core "1.0.1"]
@@ -54,6 +55,5 @@ project](https://github.com/pallet/pallet-hadoop-example) here. For
more detailed information on the project's design, see [the project
wiki](https://github.com/pallet/pallet-hadoop).
-Pallet-Hadoop version `0.3.3-beta.4` uses Pallet 0.7.0, jclouds
-1.4.2 and Clojure 1.3+, but should also work with Pallet 0.6.8,
-jclouds 1.2.2 and Clojure 1.2.1.
+Pallet-Hadoop version `0.3.3` uses Pallet `0.7.2`, jclouds
+`1.4.2` and Clojure `1.3` and later.
View
14 project.clj
@@ -1,15 +1,15 @@
-(defproject org.cloudhoist/pallet-hadoop "0.3.3-beta.4"
+(defproject org.cloudhoist/pallet-hadoop "0.3.3"
:description "Pallet meets Hadoop."
:dev-resources-path "dev"
:repositories {"sonatype" "https://oss.sonatype.org/content/repositories/releases/"}
:dependencies [[org.clojure/clojure "1.4.0"]
- [org.cloudhoist/pallet "0.7.0"]
- [org.cloudhoist/hadoop "0.7.0-beta.2"]
+ [org.cloudhoist/pallet "0.7.2"]
+ [org.cloudhoist/hadoop "0.7.0"]
[org.cloudhoist/java "0.5.1"]
[org.cloudhoist/automated-admin-user "0.5.0"]]
- :dev-dependencies [[org.jclouds/jclouds-all "1.4.1"]
- [org.jclouds.driver/jclouds-jsch "1.4.1"]
- [org.jclouds.driver/jclouds-slf4j "1.4.1"]
- [org.cloudhoist/pallet-jclouds "1.4.0-beta.1"]
+ :dev-dependencies [[org.jclouds/jclouds-all "1.4.2"]
+ [org.jclouds.driver/jclouds-jsch "1.4.2"]
+ [org.jclouds.driver/jclouds-slf4j "1.4.2"]
+ [org.cloudhoist/pallet-jclouds "1.4.2"]
[ch.qos.logback/logback-classic "1.0.1"]
[ch.qos.logback/logback-core "1.0.1"]])
View
6 src/pallet_hadoop/node.clj
@@ -114,7 +114,7 @@
configure (phase (h/configure ip-type nn-tag jt-tag properties))]
{:bootstrap automated-admin-user
:configure (phase (package/package-manager :update)
- (package/package-manager :upgrade)
+ ;(package/package-manager :upgrade)
(java :openjdk)
(h/install :cloudera)
configure)
@@ -281,8 +281,8 @@
;; rebuild the cluster EC2 will report both running and terminated
;; nodes for quite a while.
(when-let [master-node (first
- (filter running?
- (tag-kwd (nodes-by-tag (nodes service)))))]
+ (tag-kwd (nodes-by-tag
+ (filter running? (nodes service)))))]
(case ip-type
:private (private-ip master-node)
:public (primary-ip master-node))))
Please sign in to comment.
Something went wrong with that request. Please try again.