[
https://issues.apache.org/jira/browse/SOLR-11947?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16395473#comment-16395473
]
Cassandra Targett commented on SOLR-11947:
------------------------------------------
I'm not totally sure which commit you're referring to. Was it the big commit I
did for typos a couple weeks ago? Most of it was already backported to
branch_7x, but because you had a bunch edits in master that weren't on
branch_7x, and I didn't notice that until too late, I had huge merge conflicts
and ended up removing the changes for that file entirely from my cherry-pick
and left them on master.
Which, now that I think about it, probably was the wrong thing to do and I see
now why that's caused you some confusion. I'm not sure what would happen if you
tried to backport my big commit since almost all of it already exists in the
branch. One solution would be to simply checkout the file from master to
branch_7x and branch_7_3, but I don't know if what you have in master is
supposed to be in those branches or not since I'm not sure what you're doing
overall. I don't particularly care if my changes make it into 7.3 - I can make
the changes again later for 7.4.
> 7.3 Streaming Expression Documentation
> --------------------------------------
>
> Key: SOLR-11947
> URL: https://issues.apache.org/jira/browse/SOLR-11947
> Project: Solr
> Issue Type: New Feature
> Security Level: Public(Default Security Level. Issues are Public)
> Components: documentation, streaming expressions
> Reporter: Joel Bernstein
> Priority: Major
> Attachments: SOLR-11947.patch, SOLR-11947.patch
>
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
