storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [1/6] storm git commit: Merge pull request #4 from apache/master
Date Wed, 11 Mar 2015 20:10:12 GMT
Repository: storm
Updated Branches:
  refs/heads/master bbc052ebb -> 3a3b7cea7


Merge pull request #4 from apache/master

Merger from apache/storm to caofangkun/apache-storm

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

Branch: refs/heads/master
Commit: 6c04e1bea802d28ae92a234ddbaad2c1ed0a6835
Parents: 0b9bc2e 01e75ec
Author: caofangkun <caofangkun@gmail.com>
Authored: Fri Jan 23 09:28:46 2015 +0800
Committer: caofangkun <caofangkun@gmail.com>
Committed: Fri Jan 23 09:28:46 2015 +0800

----------------------------------------------------------------------
 .gitignore                                      |   1 +
 CHANGELOG.md                                    |  13 +-
 README.markdown                                 |   3 +
 SECURITY.md                                     |  14 +-
 bin/storm                                       |  36 ++-
 bin/storm-config.cmd                            |  32 +-
 bin/storm.cmd                                   |  15 +-
 conf/defaults.yaml                              |   3 +-
 docs/documentation/Powered-By.md                |  11 +
 .../hbase/trident/state/HBaseMapState.java      |   2 +-
 .../storm/hbase/trident/state/HBaseState.java   |   2 +-
 external/storm-kafka/README.md                  |  24 +-
 external/storm-kafka/pom.xml                    |  21 +-
 .../ExponentialBackoffMsgRetryManager.java      | 167 ++++++++++
 .../jvm/storm/kafka/FailedMsgRetryManager.java  |  26 ++
 .../src/jvm/storm/kafka/PartitionManager.java   |  42 ++-
 .../src/jvm/storm/kafka/SpoutConfig.java        |   8 +
 .../ExponentialBackoffMsgRetryManagerTest.java  | 194 ++++++++++++
 pom.xml                                         |   6 +-
 storm-buildtools/storm-maven-plugins/pom.xml    |  81 +++++
 .../storm/maven/plugin/util/CommandExec.java    |  89 ++++++
 .../plugin/versioninfo/VersionInfoMojo.java     | 304 +++++++++++++++++++
 storm-core/pom.xml                              |  39 ++-
 .../src/clj/backtype/storm/daemon/nimbus.clj    |   2 +-
 .../clj/backtype/storm/daemon/supervisor.clj    |   5 +-
 storm-core/src/clj/backtype/storm/ui/core.clj   |  15 +-
 storm-core/src/clj/backtype/storm/util.clj      |   5 +-
 storm-core/src/jvm/backtype/storm/Config.java   |   6 +
 .../backtype/storm/messaging/netty/Server.java  |   2 +
 .../jvm/backtype/storm/utils/VersionInfo.java   | 131 ++++++++
 .../storm-core-version-info.properties          |  24 ++
 .../templates/topology-page-template.html       |   8 +-
 .../scheduler/multitenant_scheduler_test.clj    |   2 +
 .../test/clj/backtype/storm/supervisor_test.clj |  30 +-
 storm-dist/binary/src/main/assembly/binary.xml  |   7 -
 35 files changed, 1264 insertions(+), 106 deletions(-)
----------------------------------------------------------------------



Mime
View raw message