Skip to content

Merge from apache/storm to caofangkun/apache-storm #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
caofangkun merged 43 commits into from
May 25, 2015
Merged

Merge from apache/storm to caofangkun/apache-storm #22

caofangkun merged 43 commits into from
May 25, 2015

Conversation

@caofangkun
Copy link
Owner

@caofangkun caofangkun commented May 25, 2015

No description provided.

Curtis Allen and others added 30 commits December 23, 2014 16:13
Log errors when required kafka params are missing
326cc1c
@caofangkun
STORM-596: remove config topology.receiver.buffer.size
cad1505
@caofangkun
STORM-596: rm defaults.yaml.orig Config.java.orig
986ad60
@jangie
Correcting example's variable name
1f0aad4
@jangie
More corrections.
b968d41
@jangie
Currently same value, but this is more clear
1b4ea1e
@HeartSaVioR
[storm-redis] Clarify Redis*StateUpdater's expire is optional
86f7c17
@HeartSaVioR
fix storm.cmd to evaluate 'shift' correctly with 'storm jar'
ad0d0d3
@amontalenti
add support for "error" command in ShellSpout
2c35cb4
@caofangkun
Merge remote-tracking branch 'origin/master' into storm-596
f2067b6
@caofangkun
STORM-596:delete extra ')' in function loader#launch-receive-thread!
42bcf30
@caofangkun
STORM-596:delete extra ')' in function loader#launch-receive-thread!
7ab8b96
@caofangkun
STORM-596:delete extra ')' in function loader#launch-receive-thread!
2b839cb
Rather then just log errors when required parameters are missing, thr…
95a1055 
…ow a NullPointerException as soon as a required value is missing.
STORM-807: quote args correctly
ca3f762
Merge branch 'STORM-603' of https://github.com/curtisallen/storm into…
93f11c4 
… STORM-603

STORM-603: Log errors when required kafka params are missing
Added STORM-603 to Changelog
ea0fe12
STORM-808: allow null to be parsed as null
f21cd84
STORM-811: remove old metastor_db before running tests again.
e40a0fe
@ptgoetz
Merge branch 'STORM-745' of github.com:HeartSaVioR/storm
171a8e6
@ptgoetz
update changelog for STORM-745
ce49e16
@ptgoetz
Merge branch 'master' of github.com:amontalenti/storm
4d26d1c
@ptgoetz
update changelog for STORM-796
60f8a80
Merge branch 'STORM-807' of https://github.com/revans2/incubator-storm …
f15c3e3 
…into STORM-807

STORM-807: quote args to storm.py correctly
Added STORM-807 to Changelog
847958c
@knusbaum
Updating maven-gpg-plugin version.
e823c05
Revert "Added STORM-469 to Changelog and Reademe."
d66444c 
This reverts commit 1a9e9e9.
Revert "Merge branch 'STORM-469' of https://github.com/rekhajoshm/storm…
512d3de 
… into STORM-469"

This reverts commit 9b56bc8, reversing
changes made to 27a3606.
STORM-827: Allow AutoTGT to work with storm-hdfs too.
33d7747
Merge branch 'STORM-811' of https://github.com/revans2/incubator-storm …
c52690a 
…into STORM-811

STORM-811: remove old metastor_db before running tests again.
Robert (Bobby) Evans added 13 commits May 22, 2015 14:09
Added STORM-811 to changelog
5ee4bcf
Merge branch 'STORM-827' of https://github.com/revans2/incubator-storm …
7c95a4f 
…into STORM-827

STORM-827: Allow AutoTGT to work with storm-hdfs too.
Added STORM-827 to Changelog
d2e2d58
Merge branch 'STORM-816' of https://github.com/knusbaum/incubator-storm…
73b6437 
… into STORM-816

STORM-816: maven-gpg-plugin does not work with gpg 2.1
Added STORM-816 to Changelog
f454247
Merge branch 'STORM-808' of https://github.com/revans2/incubator-storm …
ce3cabf 
…into STORM-808

STORM-808: allow null to be parsed as null
Added STORM-808 to Changelog
972ab85
Merge branch 'storm-596' of https://github.com/caofangkun/apache-storm …
77bc461 
…into STORM-596

STORM-596: remove config topology.receiver.buffer.size
Added STORM-596 to Changelog
2195fd6
Merge branch 'patch-1' of https://github.com/jangie/storm into docs-u…
2d388fa 
…pdate

Documentation code corrections
Added jangie to Readme
427e954
Merge branch 'clarify-expire-is-optional' of https://github.com/Heart…
88af3e3 
…SaVioR/storm into STORM-752

STORM-752: [storm-redis] Clarify Redis*StateUpdater's expire is optional
Added STORM-752 to Changelog
106af61
caofangkun added a commit that referenced this pull request May 25, 2015
@caofangkun
Merge pull request #22 from apache/master
5dffff2 
Merge from apache/storm to caofangkun/apache-storm
@caofangkun caofangkun merged commit 5dffff2 into caofangkun:master May 25, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@caofangkun @jangie @HeartSaVioR @amontalenti @ptgoetz @knusbaum