GitHub user forview opened a pull request:
https://github.com/apache/storm/pull/646
0.10.x branch
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/apache/storm 0.10.x-branch
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/storm/pull/646.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 #646
----
commit 950bb0b811534782af3e53503ee017d9ba8ac997
Author: Robert (Bobby) Evans <[email protected]>
Date: 2015-03-26T14:28:55Z
Added STORM-723 to changelog
commit 5c5abdfee6ff2db7839c2faaf1782eb28f0a8723
Author: Robert (Bobby) Evans <[email protected]>
Date: 2015-03-26T14:28:06Z
Merge branch 'STORM-723' of https://github.com/HeartSaVioR/storm into
STORM-723
STORM-723: Remove RedisStateSetUpdater / RedisStateSetCountQuerier which
didn't tested and have a bug
Conflicts:
external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisStateSetCountQuerier.java
external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisStateSetUpdater.java
commit 7fd76a0166d1c74e3dc4d55afb48b046375754e1
Author: Parth Brahmbhatt <[email protected]>
Date: 2015-04-03T01:28:08Z
STORM-749: Forgot to delete the file and some other blocks.
commit 8663fa6e442c063ba994b347863618c937d269fc
Author: Parth Brahmbhatt <[email protected]>
Date: 2015-04-03T01:13:18Z
STORM-749: Remove CSRF check.
Conflicts:
storm-core/src/ui/public/css/style.css
commit 561bad88aff3391445165fa417c994bbbbf95137
Author: Parth Brahmbhatt <[email protected]>
Date: 2015-04-09T23:20:39Z
Added STORM-749 to CHANGELOG.
commit ae5a6be1b3fff6f9c7c6ebf59e12ff6ec7438123
Author: Jungtaek Lim <[email protected]>
Date: 2015-04-06T14:53:31Z
fix storm.cmd to evaluate 'shift' correctly with 'storm jar'
commit db9b4b4818968fb553398b9313a44a91b9f27542
Author: P. Taylor Goetz <[email protected]>
Date: 2015-05-07T15:28:07Z
update changelog for STORM-745
commit 367af07e0a4464a830cfe71c57912373bb11a97b
Author: P. Taylor Goetz <[email protected]>
Date: 2015-05-07T15:39:24Z
Merge branch '0.10.x-branch' of
https://git-wip-us.apache.org/repos/asf/storm into 0.10.x-branch
commit df9f541d6adf89c038f48d7613025c9d6934ef0e
Author: Andrew Montalenti <[email protected]>
Date: 2015-04-23T20:41:39Z
add support for "error" command in ShellSpout
commit d3f49ebbc04e0fb4cea41d94e37ed2376c20e716
Author: P. Taylor Goetz <[email protected]>
Date: 2015-05-07T16:07:11Z
update changelog for STORM-796
commit 8ed66de80309b6e3e44fdf6588c4196a032a7c8e
Author: Derek Dagit <[email protected]>
Date: 2015-03-20T14:48:05Z
Make CSS more consistent with self, prev release
Conflicts:
storm-core/src/ui/public/css/style.css
commit d82504194797bd3020662d9f70e77092bfa56a64
Author: P. Taylor Goetz <[email protected]>
Date: 2015-05-07T16:16:16Z
add storm-714 to changelog
commit 5cbdca55a63dbe9e1adf43b43915b6bc1a9c426d
Author: Robert (Bobby) Evans <[email protected]>
Date: 2015-04-06T17:13:35Z
STORM-750: Set Config Serialization
commit 00853197ea0a134e0dc709e2a2d9ead8df5e9ed7
Author: Robert (Bobby) Evans <[email protected]>
Date: 2015-04-06T17:15:52Z
Spelling fix
commit 24e3b98820c78be4ae03f52c66a9b36bb04ea0dc
Author: Robert (Bobby) Evans <[email protected]>
Date: 2015-04-08T13:46:32Z
STORM-762: uptime for worker heartbeats is lost when converted to thrift
commit b1dc422bd502ad031d027ba0c026c3e666abe42f
Author: Robert (Bobby) Evans <[email protected]>
Date: 2015-04-13T18:51:09Z
STORM-765: Thrift serialization for local state.
commit ebb9634ad5f324929c3ca254aa544a3d15269c39
Author: sanket <[email protected]>
Date: 2015-04-17T17:33:13Z
made changes for adding the supervisor-info version
Conflicts:
storm-core/src/clj/backtype/storm/daemon/supervisor.clj
commit 670d93e98ef66ecff342c44f31a1df7f2709c13b
Author: sanket <[email protected]>
Date: 2015-04-17T20:34:05Z
made changes for adding the supervisor-info version
commit a13c465db6bf69f9b287a0375809d75a0c6c4f36
Author: sanket <[email protected]>
Date: 2015-04-19T15:19:17Z
reverted back the unmodified thrift java classes timestamps
commit 765354ccc2976533fee57d2ce4330957f8302e64
Author: sanket <[email protected]>
Date: 2015-04-20T17:41:44Z
Included the default version info "VERSION_NOT_FOUND" tag in the thrift
file. Made the version "optional" in the thrift file
Accordingly modified the nimbus.clj file as per the above specifications.
commit 155e52ad11f041788fb9718f2c767dfdd14a9b2d
Author: P. Taylor Goetz <[email protected]>
Date: 2015-05-15T17:42:58Z
fix merge conflict
commit c9bd0eb01b97fce7e2b9325ef4639973c9d3cbd4
Author: Robert (Bobby) Evans <[email protected]>
Date: 2015-04-08T19:03:56Z
STORM-764: Have option to compress thrift heartbeat
commit 7570a43a92088bc3c106e0c26a77f864f12b2d2e
Author: Robert (Bobby) Evans <[email protected]>
Date: 2015-04-09T19:34:54Z
Addressed review comments
commit 22fe79712a2c342063063c7e4ae17f3b86677841
Author: P. Taylor Goetz <[email protected]>
Date: 2015-05-15T18:02:28Z
update changelog
commit 5fad1b1bb206a03a45d253711db46c8ee7258a74
Author: Dan Blanchard <[email protected]>
Date: 2015-04-16T20:15:32Z
Send more topology context to Multi-Lang components via initial handshake.
This commit adds the following keys to the "context" JSON dictionary sent to
multi-lang tasks as part of their handshake with ShellBolt/ShellSpout:
- componentid: the component ID for this task, so you don't have to look
it up
in "task->component" by "taskid"
- streams: a list of all of the streams for this task
- stream->outputfields: a mapping from stream names to output fields for
that
stream
- stream->target->grouping: a mapping from stream names to the targets for
this
task to the kind of grouping they use.
- sources->grouping: a mapping from the component IDs of the sources to
their
grouping.
Note on groupings: groupings are either represented as a string (e.g., "
SHUFFLE") or a list of strings for field groupings.
commit 6961be7d18f6c0a772a5fbd69f18c7ff51523179
Author: Dan Blanchard <[email protected]>
Date: 2015-04-17T15:00:21Z
Change sources->grouping to source->stream->grouping in JSON context.
commit c47d7d42d1a769277dfc4b6e11e5e07e3279b707
Author: Dan Blanchard <[email protected]>
Date: 2015-04-20T19:52:43Z
Address comments for PR #525
- Fixed a couple style/formatting issues
- Made groupings get converted to dictionaries that contain 'type' and
'fields'
keys (where only 'type' is required).
commit 4255ab5d1eb24b7884b7305e57edcabe6f2e3cbb
Author: Dan Blanchard <[email protected]>
Date: 2015-04-20T20:33:51Z
Add documentation about new topology context info available as of STORM-789.
Also cleaned up some awkward language describing heartbeats.
commit e06c7f4f3060df02e50cf68c9baf9c0615435f30
Author: P. Taylor Goetz <[email protected]>
Date: 2015-05-15T18:05:23Z
add STORM-789 to changelog
commit 12766913010670746fed792792bd553dba383e8f
Author: P. Taylor Goetz <[email protected]>
Date: 2015-05-15T18:14:23Z
add STORM-686 to CHANGELOG
----
---
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.
---
