[GitHub] storm pull request #1987: 1 x branch

2017-03-03 Thread qiuwsh 
Github user qiuwsh closed the pull request at:

https://github.com/apache/storm/pull/1987


---
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.
---

[GitHub] storm pull request #1987: 1 x branch

2017-03-03 Thread qiuwsh 
GitHub user qiuwsh opened a pull request:

https://github.com/apache/storm/pull/1987

1 x branch



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/apache/storm 1.x-branch

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/storm/pull/1987.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 #1987


commit 6ed99200c985e1b4e8ac2124a854e83d8921c2e3
Author: itiel 
Date:   2016-12-03T16:45:04Z

fix actiavte and deactive heartbeat problem

commit 4f2be9d3127643a4a5b1b067171e854ea03e8695
Author: Jungtaek Lim 
Date:   2016-12-06T23:14:08Z

Merge branch 'STORM-2234-1.x-merge' into 1.x-branch

commit ffb05137815c6bcbaff7d5c879bcd6abba79ad73
Author: Jungtaek Lim 
Date:   2016-12-06T23:15:12Z

add STORM-2234 to CHANGELOG

commit c64a109529f00e6c9e969b99d8d03a64d2f32069
Author: Kyle Nusbaum 
Date:   2016-12-02T19:46:21Z

Updating Trident RAS Documentation.

commit cce525b2df1b2c6a93423700434c52b6a03e66bb
Author: Jungtaek Lim 
Date:   2016-12-06T23:36:57Z

Merge branch 'PR-1812-1.x-merge' into 1.x-branch

commit 3b378e4fd8ce359856f294c344f5ddc0ff652c73
Author: Jungtaek Lim 
Date:   2016-12-06T06:36:23Z

STORM-2235 Introduce new option: 'add remote repositories' for dependency 
resolver

* add '--artifactRepositories' option to pull the artifacts from other than 
Maven Central

commit be4efc3e17c25f0dcb609483d29e0b600282d415
Author: Jungtaek Lim 
Date:   2016-12-08T11:13:38Z

Merge branch 'STORM-2235-1.x' into 1.x-branch

commit 0cd627f7c5294f42f40b1e313194275b38312f25
Author: Jungtaek Lim 
Date:   2016-12-08T11:14:05Z

STORM-2235: CHANGELOG

commit 1bfff31da87d6913a4cfff95a9c6f14f6f001dd7
Author: marblejenka 
Date:   2016-12-11T09:48:51Z

modified incorrect and broken links

commit c149fe1e169e682c43981ffa02550afead5e
Author: vesense 
Date:   2016-12-13T03:09:30Z

Merge branch '1.x-branch-fixed-Structure-of-the-codebase' of 
https://github.com/marblejenka/storm into 1.x-branch

commit 5c17a59ebf9f5667ccfb2dc0a127044b94a0de86
Author: Jeff Fenchel 
Date:   2016-09-11T01:32:35Z

STORM-2087: storm-kafka-client improvements for kafka 0.10
 - Added unit tests to storm-kafka-client
 - Fixed bug in kafka-spout-client that resulted in tuples not being  
replayed
when a failure occurred immediately after the last commit
 - Modified the kafka spout to continue processing and not halt upon 
receiving
a double ack

commit e47ccecba855889b75da40a3cceb190587552aef
Author: Stig Rohde Døssing 
Date:   2016-12-14T18:29:48Z

STORM-2087: Make tests Java 7 compatible

commit 9ecf82c56e0d1882d1a30442fdd6d59e189b4a36
Author: Hugo Louro 
Date:   2016-12-17T08:57:13Z

Fix typo in flux.md

commit 7802298f1993af9dbce9e6b8b23c4d4ffd933ba0
Author: Arun Mahadevan 
Date:   2016-12-13T10:53:35Z

STORM-2246: Logviewer download link has urlencoding on part of the URL

Changed the URL format for "Download full file" link under worker logs
from "download/URLENCODED()" to 
"download?file=URLENCODED()"

commit c65223a7192409557c179b4eced7dd3dd250f6a7
Author: Jungtaek Lim 
Date:   2016-12-18T11:41:37Z

Merge branch 'STORM-2246-1.x-merge' into 1.x-branch

commit 3c6abc8f75b74d7ce464bdfc32530d4ffaa8c8b4
Author: Jungtaek Lim 
Date:   2016-12-18T11:42:02Z

STORM-2246: CHANGELOG

commit 032592a892356e36fd3848b1f1692099eed90d28
Author: Arun Mahadevan 
Date:   2016-12-08T15:48:12Z

[STORM-2238] Add Timestamp extractor for windowed bolt

Added a timestamp extractor so that the tuple timestamp can be derived from 
the tuple than directly
mapping it to a field within the tuple.

commit 7bf95d6644b294bd456e08386fe59ed1c78e0c5e
Author: Jungtaek Lim 
Date:   2016-12-18T22:28:13Z

Merge branch 'STORM-2238-1.x' of https://github.com/arunmahadevan/storm 
into STORM-2238-1.x-merge

commit 7701bf4ea99aa1a5ee34984c489f4de1eb495a73
Author: Jungtaek Lim 
Date:   2016-12-18T22:28:32Z

STORM-2238: CHANGELOG

commit 8310f593c239577e65c2e955385320b95ed825f7
Author: Jungtaek Lim 
Date:   2016-12-20T07:42:54Z

Merge branch 'STORM-2087-1.x' of https://github.com/srdo/storm into 
STORM-2087-1.x-merge

commit 55b3099e1fdc297f235f57560d21ed160632835e
Author: Jungtaek Lim 
Date:   2016-12-20T07:45:15Z

STORM-2087: CHANGELOG

commit 145af644324b62f2c060c6e795ac6b5474fd17d2
Author: Stig Rohde Døssing