[ 
https://issues.apache.org/jira/browse/STORM-2937?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16354725#comment-16354725
 ] 

Erik Weathers commented on STORM-2937:
--------------------------------------

[~Srdo]:

{quote}
Okay. I thought the whole reason we were doing this issue was to avoid 
releasing 1.0.6 with a broken storm-kafka-client?
{quote}

Ah, fair enough -- but it's already "broken" in 1.0.1 -> 1.0.5, so I don't 
think it's being made any worse in 1.0.6.

{quote}
Regarding commit squashing, I agree while reviewing the PR that it's easier if 
the squashing happens later. In this case it was only two files outside 
storm-kafka-client that changed though. We might consider doing merges the same 
way they do on the Kafka project. They squash PRs when merging, where we squash 
during the PR. It leaves the history intact in the PR. 
{quote}

Yes, that's something my teammates and I have talked about at our work too -- 
otherwise actual useful PR comments and discussion can disappear into the ether 
when you squash and force-push to a PR branch.  Though my objection to 
always-squashing is actually broader -- I spend the vast majority of my 
"coding" time *reading* code and trying to infer things from commits and diffs. 
 Gigantic commits are often a problem for this, especially given how bad the 
majority of folks are at writing commit messages and code comments.  But this 
is getting us off on a tangent, and my position is pretty intractable so I'll 
backburner this for now.   I'll try to explain what I mean via example in the 
backport PR when I send it.  Hopefully tonight.

Also, thanks for the explanation and background on the deserializer situation, 
that is helpful!

> Overwrite storm-kafka-client 1.x-branch into 1.0.x-branch
> ---------------------------------------------------------
>
>                 Key: STORM-2937
>                 URL: https://issues.apache.org/jira/browse/STORM-2937
>             Project: Apache Storm
>          Issue Type: Task
>          Components: storm-kafka-client
>    Affects Versions: 1.0.6
>            Reporter: Jungtaek Lim
>            Assignee: Erik Weathers
>            Priority: Blocker
>
> This is to track the effort of syncing up divergence between 
> storm-kafka-client 1.x-branch and 1.0.x-branch so that critical fixes can be 
> go in 1.0.x-branch as well.
> Note that it can modify storm-core as well (unlikely in a 
> backwards-incompatible way but not 100% sure), so we should make a decision 
> whether we allow the change in bugfix version line.
> Linking discussion thread:
> [https://lists.apache.org/thread.html/0451fed132bb982b618d9e0780282a87554f1bc5747827599f276944@%3Cdev.storm.apache.org%3E]



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

Reply via email to