You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2014/05/20 18:52:01 UTC
[2/3] git commit: Merge branch 'STORM-265'
Merge branch 'STORM-265'
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/a3d8d963
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/a3d8d963
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/a3d8d963
Branch: refs/heads/master
Commit: a3d8d9633cff99456608a6394b9ecbb5389f3683
Parents: a6bbd87 7567d13
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue May 20 12:46:51 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue May 20 12:46:51 2014 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/a3d8d963/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 2362040,67efd8e..2c0cbc1
--- a/pom.xml
+++ b/pom.xml
@@@ -151,10 -150,10 +151,10 @@@
<test.extra.args>-Djava.net.preferIPv4Stack=true</test.extra.args>
<!-- dependency versions -->
- <clojure.version>1.4.0</clojure.version>
+ <clojure.version>1.5.1</clojure.version>
<compojure.version>1.1.3</compojure.version>
<hiccup.version>0.3.6</hiccup.version>
- <commons-io.verson>1.4</commons-io.verson>
+ <commons-io.version>2.4</commons-io.version>
<commons-lang.version>2.5</commons-lang.version>
<commons-exec.version>1.1</commons-exec.version>
<clj-time.version>0.4.1</clj-time.version>