GitHub user roshannaik opened a pull request: https://github.com/apache/storm/pull/1912
Storm 2334 - Bolt for joining multiple streams Detailed description given in [STORM-2334](https://issues.apache.org/jira/browse/STORM-2334) You can merge this pull request into a Git repository by running: $ git pull https://github.com/roshannaik/storm STORM-2334 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/storm/pull/1912.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 #1912 ---- commit 34d608b2f1ca263b7b7728ea593e673bfeeccc31 Author: Robert (Bobby) Evans <reva...@gmail.com> Date: 2016-11-01T14:13:56Z Merge pull request #7 from srdo/STORM-2175-1.x-disable-shutdown-timeout-in-local-mode Remove time limit on Slot shutdown when running in local mode commit 9f981e533f2da6cb387658cc0f84b84a1054883e Author: Robert (Bobby) Evans <ev...@yahoo-inc.com> Date: 2016-11-01T15:26:06Z STORM-2175: Allow for longer timeout and different operations on failures commit 1d7aeaaee17b2233ec5b16235f67ddb81a218e4f Author: Jungtaek Lim <kabh...@gmail.com> Date: 2016-11-02T23:48:15Z also add STORM-2018 to 1.0.3 commit 4fb52c830b7b1cf0b619be64157f238edfc6cbf4 Author: Jungtaek Lim <kabh...@gmail.com> Date: 2016-11-03T00:08:04Z Merge branch 'STORM-2175-1.x' of https://github.com/revans2/incubator-storm into STORM-2175-1.x commit 10944800537fc562948c13247df486e127c1f8bf Author: Jungtaek Lim <kabh...@gmail.com> Date: 2016-11-03T00:08:34Z add STORM-2175 to CHANGELOG commit 0920b6d4d291e5b0d67f0eb38fa23e38122d997f Author: vesense <best.wang...@163.com> Date: 2016-10-28T05:38:42Z STORM-2103: Introduce new sql external module: storm-sql-mongodb commit ff61fdf366d29741727e7aa25d962e9476b860b1 Author: Jungtaek Lim <kabh...@gmail.com> Date: 2016-11-05T01:55:13Z Merge branch 'STORM-2103-1.x-merge' into 1.x-branch commit c760e13959f29ad6d387a093057777c513a88c2d Author: Jungtaek Lim <kabh...@gmail.com> Date: 2016-11-05T01:55:35Z add STORM-2103 to CHANGELOG commit e18f0ae63dad71af31971ab5801495ba9c0ce2e3 Author: Kyle Nusbaum <knusb...@yahoo-inc.com> Date: 2016-11-02T20:29:53Z STORM-2185: Storm Supervisor doesn't delete directories properly sometimes * Closes #1759 commit 21a36376be8ca3fa79d3b71ca2b9c7c221470ed8 Author: Jungtaek Lim <kabh...@gmail.com> Date: 2016-11-07T14:02:57Z Merge branch 'STORM-2185-1.x-merge' into 1.x-branch commit bf8437c20e65134801ee4b8eeb77e81f8b17e09a Author: Jungtaek Lim <kabh...@gmail.com> Date: 2016-11-07T14:03:19Z add STORM-2185 to CHANGELOG commit 10b165a2d0e9c5253395af7d8c086f4f979e6e1b Author: Stig Rohde Døssing <s...@it-minds.dk> Date: 2016-11-02T17:36:44Z STORM-2184: Don't wakeup KafkaConsumer on shutdown, spout methods are not called by multiple threads at a time commit 8b19d0e45b49032db9c86dedcaf1ae978a5076bf Author: Jungtaek Lim <kabh...@gmail.com> Date: 2016-11-07T14:16:31Z Merge branch 'STORM-2184-1.x-merge' into 1.x-branch commit 0a1f433100d3f8189fd783e364625e5f1606223e Author: Jungtaek Lim <kabh...@gmail.com> Date: 2016-11-07T14:16:50Z add STORM-2184 to CHANGELOG commit 841feafe90afa6951fcc8c33355ffce1f8a8d354 Author: Sriharsha Chintalapani <har...@hortonworks.com> Date: 2016-11-07T18:57:57Z Minor: storm-sql-mongodb parent version change. commit 8d1b61a5f83b9bdf3ece2e94b2aaaf46da040e5a Author: Li Wang <wangli1...@gmail.com> Date: 2016-11-07T03:03:05Z [STORM-2189] RAS_Node::freeCPU outputs incorrect info CPU trying to free should be ``_availCPU + amount`` rather than ``_availMemory + amount``. commit 62264e15612b7deeefc32154559c843fc3c053d2 Author: Jungtaek Lim <kabh...@gmail.com> Date: 2016-11-09T00:34:53Z Merge branch 'STORM-2189-1.x-merge' into 1.x-branch commit 08b0074c42c357ba78ac276bd21d6f9e2fdee1e0 Author: Jungtaek Lim <kabh...@gmail.com> Date: 2016-11-09T00:35:13Z add STORM-2189 to CHANGELOG commit eda583a0cf3ddf99a7879a37bc21f866b6d6a323 Author: Satish Duggana <sdugg...@hortonworks.com> Date: 2016-11-10T04:05:31Z STORM-2197: Fix for NimbusClient connectins leak due to ThriftClient connection's leakage in case of errors. commit 44ea6ad7579307b26a5e675ee06086c46abcc9a9 Author: Satish Duggana <sdugg...@hortonworks.com> Date: 2016-11-11T10:00:15Z Merge branch 'STORM-2197' of https://github.com/satishd/storm into STORM-2197-1.x commit 334fcef221e522c6009b9bec4af0f369cdc39723 Author: Satish Duggana <sdugg...@hortonworks.com> Date: 2016-11-11T10:07:02Z Added STORM-2197 to CHANGELOG commit ada5a5b34cd908ee7bb329b17d8b8c2389ffc4c7 Author: Xin Wang <best.wang...@163.com> Date: 2016-11-11T15:12:31Z [STORM-2172][SQL] Support Avro as input / output format commit 8e9d4c37b2f8e0c9665cad090d487dc68986575f Author: Xin Wang <best.wang...@163.com> Date: 2016-11-11T15:17:01Z [STORM-2172][SQL] version fix commit d86039dae56b3e8fad4d265fb345dd89f97cec3c Author: Jungtaek Lim <kabh...@gmail.com> Date: 2016-11-13T04:42:02Z Merge branch 'STORM-2172-1.x' of https://github.com/vesense/storm into STORM-2172-1.x-merge commit 7c28273c43ac2059be9435e045fc952f130b4a18 Author: Jungtaek Lim <kabh...@gmail.com> Date: 2016-11-13T05:30:48Z add STORM-2172 to CHANGELOG commit 93b09c2c242e1e2f4638a459cf0670dcfa78c3cc Author: Li Wang <wangli1...@gmail.com> Date: 2016-11-10T04:48:26Z [STORM-2196] A typo in RAS_Node::consumeCPU Fixed a typo in RAS_Node::consumeCPU() commit 5626853a7fdf678d0d3e4254406706ac195a8058 Author: Jungtaek Lim <kabh...@gmail.com> Date: 2016-11-14T02:20:59Z Merge branch 'STORM-2196-1.x-merge' into 1.x-branch commit fe03b706fd06ec399630b7b1ceb40f48b16024c2 Author: Jungtaek Lim <kabh...@gmail.com> Date: 2016-11-14T02:21:20Z add STORM-2196 to CHANGELOG commit c967c170c0f2d29aa642afa621b1157bb7c2e2d2 Author: Jungtaek Lim <kabh...@gmail.com> Date: 2016-11-14T10:02:57Z Merge branch 'STORM-2177' of https://github.com/vesense/storm into STORM-2173-2177-merge commit 5009f7887c206cb81c071b08d4379ecf58e04a3e Author: Jungtaek Lim <kabh...@gmail.com> Date: 2016-11-14T12:49:51Z STORM-2173 & STORM-2177 test fix for JDK 1.7 ---- --- 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 infrastruct...@apache.org or file a JIRA ticket with INFRA. ---