storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [03/10] storm git commit: Merge remote-tracking branch 'upstream/master'
Date Thu, 10 Mar 2016 14:33:50 GMT
Merge remote-tracking branch 'upstream/master'


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0726c116
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0726c116
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0726c116

Branch: refs/heads/master
Commit: 0726c116ebd2ef27b5225027bdf3008e6156018d
Parents: c7241a6 672c895
Author: basti.lj <basti.lj@alibaba-inc.com>
Authored: Fri Mar 4 15:18:28 2016 +0800
Committer: basti.lj <basti.lj@alibaba-inc.com>
Committed: Fri Mar 4 15:18:28 2016 +0800

----------------------------------------------------------------------
 .gitignore                                      |  1 +
 CHANGELOG.md                                    |  6 ++
 bin/storm.cmd                                   |  2 +-
 bin/storm.py                                    |  4 +-
 .../storm/starter/ThroughputVsLatency.java      |  2 +-
 pom.xml                                         | 23 +++++++
 .../apache/storm/command/upload_credentials.clj | 35 -----------
 .../src/jvm/org/apache/storm/command/List.java  | 50 ---------------
 .../apache/storm/command/ListTopologies.java    | 52 ++++++++++++++++
 .../apache/storm/command/UploadCredentials.java | 61 +++++++++++++++++++
 .../apache/storm/security/auth/AuthUtils.java   | 40 ++++++++++++
 .../storm/security/auth/kerberos/AutoTGT.java   | 64 +++++++++-----------
 .../auth/kerberos/AutoTGTKrb5LoginModule.java   |  8 ++-
 .../jvm/org/apache/storm/utils/ConfigUtils.java |  6 +-
 .../src/jvm/org/apache/storm/utils/Utils.java   |  9 +--
 .../security/auth/auto_login_module_test.clj    | 24 +++++++-
 .../clj/org/apache/storm/supervisor_test.clj    | 11 ++--
 17 files changed, 256 insertions(+), 142 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/0726c116/storm-core/src/jvm/org/apache/storm/utils/Utils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/storm/blob/0726c116/storm-core/test/clj/org/apache/storm/supervisor_test.clj
----------------------------------------------------------------------
diff --cc storm-core/test/clj/org/apache/storm/supervisor_test.clj
index a74fc6e,415a56d..9739d7d
--- a/storm-core/test/clj/org/apache/storm/supervisor_test.clj
+++ b/storm-core/test/clj/org/apache/storm/supervisor_test.clj
@@@ -832,8 -833,9 +834,9 @@@
                          ))
          (validate-launched-once (:launched changed)
            {"sup1" [1 2]}
 -          (get-storm-id (:storm-cluster-state cluster) "topology1"))
 +          (StormCommon/getStormId (:storm-cluster-state cluster) "topology1"))
          (validate-launched-once (:launched changed)
            {"sup1" [3 4]}
 -          (get-storm-id (:storm-cluster-state cluster) "topology2"))
 +          (StormCommon/getStormId (:storm-cluster-state cluster) "topology2"))
          )))
+ 


Mime
View raw message