GitHub user csivaguru opened a pull request:
https://github.com/apache/storm/pull/1430
1.0.x branch
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/csivaguru/storm 1.0.x-branch
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/storm/pull/1430.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1430
----
commit 4d75ec8494eeda24d6510641259d4c469cff3ee2
Author: Julien Nioche <[email protected]>
Date: 2016-03-16T11:14:24Z
Fix logging for LoggingMetricsConsumer STORM-584
commit ceeab062ef73ecdfa66c136ba655ce773fb2d9fc
Author: Robert (Bobby) Evans <[email protected]>
Date: 2016-03-16T13:50:38Z
Merge branch 'master' of https://github.com/srdo/storm into STORM-1549
STORM-1549: Add support for resetting tuple timeout from bolts via the
OutputCollector
commit 4d15d4c3851acf94fbfe876b3d13842c492bdbc3
Author: Robert (Bobby) Evans <[email protected]>
Date: 2016-03-16T14:35:56Z
Added STORM-1549 to Changelog
commit c03a12a98d1486b7268be9d1221b382b3ca2303c
Author: Robert (Bobby) Evans <[email protected]>
Date: 2016-03-16T14:44:58Z
Merge branch 'port-scheduler-to-java' of https://github.com/vesense/storm
into STORM-1232
STORM-1232: port backtype.storm.scheduler.DefaultScheduler to java
STORM-1231: port backtype.storm.scheduler.EvenScheduler to java
commit 762ca287a7c77988d3ecdebbd6df331950a41ef2
Author: Robert (Bobby) Evans <[email protected]>
Date: 2016-03-16T14:45:38Z
Added STORM-1232 and STORM-1231 to Changelog
commit 178dd5464790cb8a01c09b43f04ce7dfbc61a332
Author: Kyle Nusbaum <[email protected]>
Date: 2016-03-16T20:33:03Z
Addressing Comments.
commit 5404023ae5372ac84d7f77a2bcc71015cd50d240
Author: Kyle Nusbaum <[email protected]>
Date: 2016-03-16T20:52:38Z
adding code documentation explaining math of combining component resources.
commit a583bf30ca845850600c773e3c36c76b3a0c282c
Author: Sriharsha Chintalapani <[email protected]>
Date: 2016-03-17T00:54:21Z
Merge branch 'maven-status' of https://github.com/vesense/storm into
STORM-1624
commit 413c740135ad528c28bba0499ebdd212b5c886bf
Author: Sriharsha Chintalapani <[email protected]>
Date: 2016-03-17T00:55:29Z
Added STORM-1624 to CHANGELOG.
commit d63167cc4a13289ef46b5fa1650621c57b191d3b
Author: xiaojian.fxj <[email protected]>
Date: 2016-03-17T01:29:54Z
Merge branch 'master' of github.com:apache/storm
commit aad675be9e7f8334cc3373b425831746a41ff1d1
Author: xiaojian.fxj <[email protected]>
Date: 2016-03-17T01:30:36Z
Merge branch 'master' into pacemaker
commit 198fa646da1e4161259193ca81039a04e9f68790
Author: xiaojian.fxj <[email protected]>
Date: 2016-03-17T01:45:33Z
update code based on redsanket
commit 0893c81af1511ff1643f32e68fd7a6aa6ae38934
Author: Boyang Jerry Peng <[email protected]>
Date: 2016-03-17T03:14:58Z
Merge branch 'nimbus-bug' of https://github.com/hustfxj/storm
commit 50701df4ae3249e43200eaa9803e471cf7513543
Author: Boyang Jerry Peng <[email protected]>
Date: 2016-03-17T03:16:06Z
Added STORM-1623 to CHANGELOG
commit 5863d4af59997d9456decd1c0bf02e9bd1202b61
Author: Boyang Jerry Peng <[email protected]>
Date: 2016-03-16T20:27:41Z
[STORM-1634] - Minor Refactoring of Resource Aware Scheduler
commit 580ed9d2c4b012701fb6c1a307afe86eaf32863e
Author: Boyang Jerry Peng <[email protected]>
Date: 2016-03-17T04:45:42Z
[STORM-1636] - Supervisor shutdown with worker id pass in being nil
commit 8dd66bfb378b7b103694b7d968ad21483f3a3b80
Author: Jungtaek Lim <[email protected]>
Date: 2016-03-17T06:53:15Z
STORM-1602 Blobstore UTs are failed on Windows
* ensures objects of InputStream / OutputStream are closed after using
* clojure: with-open
* java: try-with-resource
* skip checking symbolic link in LocalizerTest when on Windows
* Windows seems not handle symbolic link in compressed file properly
commit 251bc5691eb83506ba5934724311883486a1c9d2
Author: Kyle Nusbaum <[email protected]>
Date: 2016-03-17T18:28:19Z
Addressing comments and adding a bit more documentation.
commit fb880cae02415889708bb38138795a886164db2f
Author: Kyle Nusbaum <[email protected]>
Date: 2016-03-17T20:03:07Z
Merge branch 'Trident-RAS-v2' of https://github.com/knusbaum/incubator-storm
commit 367464a3d9aa92fca9d64f4e50e780b775279a3a
Author: Kyle Nusbaum <[email protected]>
Date: 2016-03-17T20:04:13Z
Adding STORM-1616 to CHANGELOG.md
commit acd581d952d93c4fadf7dc9b668680d6a817569e
Author: xiaojian.fxj <[email protected]>
Date: 2016-03-18T13:16:08Z
add jmx for Pacemaker
commit 2e2ffb29df039e9339e7b2b44352c744efb5caf0
Author: xiaojian.fxj <[email protected]>
Date: 2016-03-18T13:16:44Z
Merge branch 'master' of github.com:apache/storm
commit ca4507fcfa0c54bbb7f2464c388cff24ee524aad
Author: xiaojian.fxj <[email protected]>
Date: 2016-03-18T13:17:32Z
Merge branch 'master' into pacemaker
commit c1b93de1650d113df0e1d0493780d9915bf3dacc
Author: zhuol <[email protected]>
Date: 2016-03-18T21:06:00Z
[STORM-1300] port backtype.storm.scheduler.resource-aware-scheduler-test to
java.
commit 7a302e3bc5b6652642ed5fb9ff6f4fed8607680f
Author: zhuol <[email protected]>
Date: 2016-03-18T21:11:50Z
Minor
commit 6340601684ccd1cbe86d27594f8e32e78ec8a0df
Author: zhuol <[email protected]>
Date: 2016-03-18T21:13:28Z
Delete the clj code
commit 4e42665452e500e3f0d9d460d6cde83e63dc92c2
Author: xiaojian.fxj <[email protected]>
Date: 2016-03-19T12:36:25Z
update PacemakerTest
commit abbfb9737e4c99eb27b96aa85335294b025c348e
Author: Robert (Bobby) Evans <[email protected]>
Date: 2016-03-19T17:15:21Z
STORM-1617: Release Specific Documentation 0.9.x
Conflicts:
.gitignore
docs/README.md
docs/_config.yml
docs/_includes/footer.html
docs/_includes/head.html
docs/_includes/header.html
docs/_layouts/about.html
docs/_layouts/default.html
docs/_layouts/documentation.html
docs/_layouts/page.html
docs/_layouts/post.html
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css.map
docs/assets/js/bootstrap.min.js
docs/images/logos/alibaba.jpg
docs/images/logos/groupon.jpg
docs/images/logos/parc.png
docs/images/logos/webmd.jpg
docs/images/topology.png
Conflicts:
.gitignore
docs/README.md
docs/STORM-UI-REST-API.md
docs/_config.yml
docs/_includes/footer.html
docs/_includes/head.html
docs/_includes/header.html
docs/_layouts/about.html
docs/_layouts/default.html
docs/_layouts/documentation.html
docs/_layouts/page.html
docs/_layouts/post.html
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css.map
docs/assets/js/bootstrap.min.js
docs/images/logos/alibaba.jpg
docs/images/logos/groupon.jpg
docs/images/logos/parc.png
docs/images/logos/webmd.jpg
commit d909db8fe2aee7633b6f3b95ae71c415efea495f
Author: Robert (Bobby) Evans <[email protected]>
Date: 2016-03-19T17:33:31Z
STORM-1617: 0.10.x release docs
Conflicts:
docs/images/topology.png
commit 69dfb5322f896057c21cf6bf758938cb14bc3984
Author: Robert (Bobby) Evans <[email protected]>
Date: 2016-03-19T17:56:04Z
STORM-1617: added in 1.x specific doc changes
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
