[
http://opencast.jira.com/browse/MH-8190?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=28100#comment-28100
]
Rubén Pérez Vázquez edited comment on MH-8190 at 10/3/11 3:27 PM:
------------------------------------------------------------------
Greg, please, could you take a look at this (are there outstanding issues with
the merge of the series service?) and bounce it back to me if appropriate :-)
was (Author: ruben.perez):
Greg, please, take a look at this and bounce it back to me if appropriate :)
> Outstanding merges for Rubencino
> --------------------------------
>
> Key: MH-8190
> URL: http://opencast.jira.com/browse/MH-8190
> Project: Matterhorn Project
> Issue Type: Sub-Task
> Components: Engage Tools
> Affects Versions: 1.3
> Reporter: Christopher Brooks
> Assignee: Greg Logan
> Fix For: 1.3
>
>
> I updated trunk and branch 1.2.x to the same head version, version 11029. I
> then attempted to merge the two to determine where conflicts may still lie:
> cd /opt/matterhorn/matterhorn_trunk
> svn merge --dry-run https://opencast.jira.com/svn/MH/branches/1.2.x .
> Here are the conflicting files I saw that were related to your work (lots of
> updated files, I am presuming these are as expected. They may not be, ymmv).
> C
> modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/search/impl/solr/SolrRequester.java
> C
> modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/search/impl/solr/Schema.java
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators:
http://opencast.jira.com/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
_______________________________________________
Matterhorn mailing list
[email protected]
http://lists.opencastproject.org/mailman/listinfo/matterhorn
To unsubscribe please email
[email protected]
_______________________________________________
