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/07 17:20:07 UTC
[2/3] git commit: Merge branch 'rebalance-cmd' of
github.com:harshach/incubator-storm
Merge branch 'rebalance-cmd' of github.com:harshach/incubator-storm
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/3497c771
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/3497c771
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/3497c771
Branch: refs/heads/master
Commit: 3497c7716ae475899e1af6192ace7ed2b9745cc4
Parents: 7c04873 bd4ee0e
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed May 7 11:17:27 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed May 7 11:17:27 2014 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
storm-core/src/clj/backtype/storm/command/rebalance.clj | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/3497c771/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index aa93fcc,77a8b85..2362040
--- a/pom.xml
+++ b/pom.xml
@@@ -165,8 -164,8 +165,8 @@@
<clojure.math.numeric-tower.version>0.0.1</clojure.math.numeric-tower.version>
<carbonite.version>1.4.0</carbonite.version>
<snakeyaml.version>1.11</snakeyaml.version>
- <httpclient.version>4.1.1</httpclient.version>
+ <httpclient.version>4.3.3</httpclient.version>
- <clojure.tools.cli.version>0.2.2</clojure.tools.cli.version>
+ <clojure.tools.cli.version>0.2.4</clojure.tools.cli.version>
<disruptor.version>2.10.1</disruptor.version>
<jgrapht.version>0.9.0</jgrapht.version>
<guava.version>13.0</guava.version>