API tools faq
paste
Guest User

Untitled

a guest
Jul 13th, 2015
165
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 135.85 KB | None | 0 0
raw download clone embed print report
  1. Merging:
  2. 80a252d Merge tag 'DCE/1.5.1-1.16.2-release'
  3. virtual upstream/r/1.6.x
  4. found 2 common ancestors:
  5. 36b118b Merging fix for MH-9670 into 1.4.x
  6. d9f93d3 MH-10475: corrected version number in welcome.html
  7. Merging:
  8. 36b118b Merging fix for MH-9670 into 1.4.x
  9. d9f93d3 MH-10475: corrected version number in welcome.html
  10. found 1 common ancestor:
  11. f804568 MH-8697: fixed. client now waiting for upload job being in state COMPLETE
  12. CONFLICT (rename/add): Rename modules/matterhorn-admin-ui/src/main/java/org/opencastproject/adminui/Activator.java->modules/matterhorn-working-file-repository-service-api/src/main/java/org/opencastproject/workingfilerepository/jmx/WorkingFileRepositoryMXBean.java in Temporary merge branch 2. modules/matterhorn-working-file-repository-service-api/src/main/java/org/opencastproject/workingfilerepository/jmx/WorkingFileRepositoryMXBean.java added in Temporary merge branch 1
  13. Adding merged modules/matterhorn-working-file-repository-service-api/src/main/java/org/opencastproject/workingfilerepository/jmx/WorkingFileRepositoryMXBean.java
  14. Auto-merging shared-resources/templates/common-data.tpl
  15. CONFLICT (add/add): Merge conflict in shared-resources/templates/common-data.tpl
  16. Auto-merging shared-resources/player/embed.html
  17. CONFLICT (content): Merge conflict in shared-resources/player/embed.html
  18. Auto-merging shared-resources/player/Videodisplay.swf
  19. CONFLICT (content): Merge conflict in shared-resources/player/Videodisplay.swf
  20. Auto-merging shared-resources/js/player/watch.js
  21. CONFLICT (content): Merge conflict in shared-resources/js/player/watch.js
  22. Auto-merging shared-resources/js/player/player-multi-hybrid.js
  23. Auto-merging shared-resources/js/player/embed-hybrid-initialize.js
  24. Auto-merging shared-resources/js/engage_plugins/series.js
  25. CONFLICT (content): Merge conflict in shared-resources/js/engage_plugins/series.js
  26. Auto-merging shared-resources/js/engage_plugins/embedControlHide.js
  27. CONFLICT (content): Merge conflict in shared-resources/js/engage_plugins/embedControlHide.js
  28. Auto-merging shared-resources/js/engage_plugins/annotation/annotation_comment_list.js
  29. Auto-merging shared-resources/js/engage_plugins/annotation/annotation_comment_list-plugin.js
  30. Auto-merging shared-resources/js/engage_plugins/annotation/annotation_comment.js
  31. CONFLICT (content): Merge conflict in shared-resources/js/engage_plugins/annotation/annotation_comment.js
  32. Auto-merging shared-resources/js/bridge/Videodisplay.js
  33. Auto-merging pom.xml
  34. CONFLICT (content): Merge conflict in pom.xml
  35. Auto-merging modules/matterhorn-workspace-impl/src/main/java/org/opencastproject/workspace/impl/jmx/WorkspaceMXBean.java
  36. CONFLICT (add/add): Merge conflict in modules/matterhorn-workspace-impl/src/main/java/org/opencastproject/workspace/impl/jmx/WorkspaceMXBean.java
  37. Auto-merging modules/matterhorn-workspace-impl/src/main/java/org/opencastproject/workspace/impl/WorkspaceImpl.java
  38. CONFLICT (content): Merge conflict in modules/matterhorn-workspace-impl/src/main/java/org/opencastproject/workspace/impl/WorkspaceImpl.java
  39. Auto-merging modules/matterhorn-workspace-impl/pom.xml
  40. Auto-merging modules/matterhorn-workspace-api/src/main/java/org/opencastproject/workspace/api/Workspace.java
  41. Auto-merging modules/matterhorn-working-file-repository-service-remote/src/main/java/org/opencastproject/workingfilerepository/remote/WorkingFileRepositoryRemoteImpl.java
  42. CONFLICT (content): Merge conflict in modules/matterhorn-working-file-repository-service-remote/src/main/java/org/opencastproject/workingfilerepository/remote/WorkingFileRepositoryRemoteImpl.java
  43. Auto-merging modules/matterhorn-working-file-repository-service-impl/src/main/java/org/opencastproject/workingfilerepository/impl/WorkingFileRepositoryRestEndpoint.java
  44. CONFLICT (content): Merge conflict in modules/matterhorn-working-file-repository-service-impl/src/main/java/org/opencastproject/workingfilerepository/impl/WorkingFileRepositoryRestEndpoint.java
  45. Auto-merging modules/matterhorn-working-file-repository-service-impl/src/main/java/org/opencastproject/workingfilerepository/impl/WorkingFileRepositoryImpl.java
  46. CONFLICT (content): Merge conflict in modules/matterhorn-working-file-repository-service-impl/src/main/java/org/opencastproject/workingfilerepository/impl/WorkingFileRepositoryImpl.java
  47. Auto-merging modules/matterhorn-working-file-repository-service-impl/pom.xml
  48. Auto-merging modules/matterhorn-working-file-repository-service-api/src/main/java/org/opencastproject/workingfilerepository/api/WorkingFileRepository.java
  49. Auto-merging modules/matterhorn-working-file-repository-service-api/pom.xml
  50. Auto-merging modules/matterhorn-workflow-service-remote/src/main/java/org/opencastproject/workflow/remote/WorkflowServiceRemoteImpl.java
  51. Auto-merging modules/matterhorn-workflow-service-impl/src/test/java/org/opencastproject/workflow/impl/WorkflowStatisticsTest.java
  52. CONFLICT (content): Merge conflict in modules/matterhorn-workflow-service-impl/src/test/java/org/opencastproject/workflow/impl/WorkflowStatisticsTest.java
  53. Auto-merging modules/matterhorn-workflow-service-impl/src/test/java/org/opencastproject/workflow/impl/WorkflowServiceSolrIndexTest.java
  54. CONFLICT (content): Merge conflict in modules/matterhorn-workflow-service-impl/src/test/java/org/opencastproject/workflow/impl/WorkflowServiceSolrIndexTest.java
  55. Auto-merging modules/matterhorn-workflow-service-impl/src/test/java/org/opencastproject/workflow/impl/WorkflowServiceImplTest.java
  56. CONFLICT (content): Merge conflict in modules/matterhorn-workflow-service-impl/src/test/java/org/opencastproject/workflow/impl/WorkflowServiceImplTest.java
  57. Auto-merging modules/matterhorn-workflow-service-impl/src/test/java/org/opencastproject/workflow/impl/WorkflowServiceImplAuthzTest.java
  58. CONFLICT (content): Merge conflict in modules/matterhorn-workflow-service-impl/src/test/java/org/opencastproject/workflow/impl/WorkflowServiceImplAuthzTest.java
  59. Auto-merging modules/matterhorn-workflow-service-impl/src/test/java/org/opencastproject/workflow/impl/WorkflowOperationSkippingTest.java
  60. CONFLICT (content): Merge conflict in modules/matterhorn-workflow-service-impl/src/test/java/org/opencastproject/workflow/impl/WorkflowOperationSkippingTest.java
  61. Auto-merging modules/matterhorn-workflow-service-impl/src/test/java/org/opencastproject/workflow/impl/SecurityServiceStub.java
  62. CONFLICT (content): Merge conflict in modules/matterhorn-workflow-service-impl/src/test/java/org/opencastproject/workflow/impl/SecurityServiceStub.java
  63. Auto-merging modules/matterhorn-workflow-service-impl/src/test/java/org/opencastproject/workflow/impl/PauseWorkflowTest.java
  64. CONFLICT (content): Merge conflict in modules/matterhorn-workflow-service-impl/src/test/java/org/opencastproject/workflow/impl/PauseWorkflowTest.java
  65. Auto-merging modules/matterhorn-workflow-service-impl/src/test/java/org/opencastproject/workflow/impl/PauseFinalOperationTest.java
  66. CONFLICT (content): Merge conflict in modules/matterhorn-workflow-service-impl/src/test/java/org/opencastproject/workflow/impl/PauseFinalOperationTest.java
  67. Auto-merging modules/matterhorn-workflow-service-impl/src/test/java/org/opencastproject/workflow/impl/HoldStateTest.java
  68. CONFLICT (content): Merge conflict in modules/matterhorn-workflow-service-impl/src/test/java/org/opencastproject/workflow/impl/HoldStateTest.java
  69. Auto-merging modules/matterhorn-workflow-service-impl/src/test/java/org/opencastproject/workflow/impl/CountWorkflowsTest.java
  70. CONFLICT (content): Merge conflict in modules/matterhorn-workflow-service-impl/src/test/java/org/opencastproject/workflow/impl/CountWorkflowsTest.java
  71. Auto-merging modules/matterhorn-workflow-service-impl/src/main/resources/OSGI-INF/workflow-service.xml
  72. Auto-merging modules/matterhorn-workflow-service-impl/src/main/java/org/opencastproject/workflow/impl/jmx/WorkflowsStatisticsMXBean.java
  73. CONFLICT (add/add): Merge conflict in modules/matterhorn-workflow-service-impl/src/main/java/org/opencastproject/workflow/impl/jmx/WorkflowsStatisticsMXBean.java
  74. Auto-merging modules/matterhorn-workflow-service-impl/src/main/java/org/opencastproject/workflow/impl/WorkflowServiceSolrIndex.java
  75. CONFLICT (content): Merge conflict in modules/matterhorn-workflow-service-impl/src/main/java/org/opencastproject/workflow/impl/WorkflowServiceSolrIndex.java
  76. Auto-merging modules/matterhorn-workflow-service-impl/src/main/java/org/opencastproject/workflow/impl/WorkflowServiceImpl.java
  77. CONFLICT (content): Merge conflict in modules/matterhorn-workflow-service-impl/src/main/java/org/opencastproject/workflow/impl/WorkflowServiceImpl.java
  78. Auto-merging modules/matterhorn-workflow-service-impl/src/main/java/org/opencastproject/workflow/impl/WorkflowOperationWorker.java
  79. CONFLICT (content): Merge conflict in modules/matterhorn-workflow-service-impl/src/main/java/org/opencastproject/workflow/impl/WorkflowOperationWorker.java
  80. Auto-merging modules/matterhorn-workflow-service-impl/src/main/java/org/opencastproject/workflow/impl/WorkflowDefinitionScanner.java
  81. CONFLICT (content): Merge conflict in modules/matterhorn-workflow-service-impl/src/main/java/org/opencastproject/workflow/impl/WorkflowDefinitionScanner.java
  82. Auto-merging modules/matterhorn-workflow-service-impl/src/main/java/org/opencastproject/workflow/endpoint/WorkflowRestService.java
  83. CONFLICT (content): Merge conflict in modules/matterhorn-workflow-service-impl/src/main/java/org/opencastproject/workflow/endpoint/WorkflowRestService.java
  84. Auto-merging modules/matterhorn-workflow-service-api/src/main/java/org/opencastproject/workflow/api/WorkflowService.java
  85. CONFLICT (content): Merge conflict in modules/matterhorn-workflow-service-api/src/main/java/org/opencastproject/workflow/api/WorkflowService.java
  86. Auto-merging modules/matterhorn-workflow-service-api/src/main/java/org/opencastproject/workflow/api/WorkflowParser.java
  87. Auto-merging modules/matterhorn-workflow-service-api/src/main/java/org/opencastproject/workflow/api/WorkflowInstanceImpl.java
  88. CONFLICT (content): Merge conflict in modules/matterhorn-workflow-service-api/src/main/java/org/opencastproject/workflow/api/WorkflowInstanceImpl.java
  89. Auto-merging modules/matterhorn-workflow-service-api/src/main/java/org/opencastproject/workflow/api/WorkflowException.java
  90. CONFLICT (content): Merge conflict in modules/matterhorn-workflow-service-api/src/main/java/org/opencastproject/workflow/api/WorkflowException.java
  91. Auto-merging modules/matterhorn-workflow-service-api/src/main/java/org/opencastproject/workflow/api/WorkflowDefinitionImpl.java
  92. Auto-merging modules/matterhorn-workflow-service-api/src/main/java/org/opencastproject/workflow/api/WorkflowDefinition.java
  93. CONFLICT (content): Merge conflict in modules/matterhorn-workflow-service-api/src/main/java/org/opencastproject/workflow/api/WorkflowDefinition.java
  94. Auto-merging modules/matterhorn-workflow-service-api/src/main/java/org/opencastproject/workflow/api/AbstractWorkflowOperationHandler.java
  95. CONFLICT (content): Merge conflict in modules/matterhorn-workflow-service-api/src/main/java/org/opencastproject/workflow/api/AbstractWorkflowOperationHandler.java
  96. Auto-merging modules/matterhorn-videosegmenter-remote/src/main/java/org/opencastproject/videosegmenter/remote/VideoSegmenterRemoteImpl.java
  97. CONFLICT (content): Merge conflict in modules/matterhorn-videosegmenter-remote/src/main/java/org/opencastproject/videosegmenter/remote/VideoSegmenterRemoteImpl.java
  98. Auto-merging modules/matterhorn-videosegmenter-impl/src/test/java/org/opencastproject/videosegmenter/impl/VideoSegmenterTest.java
  99. CONFLICT (content): Merge conflict in modules/matterhorn-videosegmenter-impl/src/test/java/org/opencastproject/videosegmenter/impl/VideoSegmenterTest.java
  100. Auto-merging modules/matterhorn-videosegmenter-impl/src/main/java/org/opencastproject/videosegmenter/impl/endpoint/VideoSegmenterRestEndpoint.java
  101. CONFLICT (content): Merge conflict in modules/matterhorn-videosegmenter-impl/src/main/java/org/opencastproject/videosegmenter/impl/endpoint/VideoSegmenterRestEndpoint.java
  102. Auto-merging modules/matterhorn-videosegmenter-impl/src/main/java/org/opencastproject/videosegmenter/impl/VideoSegmenterServiceImpl.java
  103. Auto-merging modules/matterhorn-videosegmenter-impl/pom.xml
  104. Skipped modules/matterhorn-usertracking-impl/src/main/resources/org/opencastproject/usertracking/endpoint/jaxb.index (merged same as existing)
  105. Auto-merging modules/matterhorn-usertracking-impl/src/main/resources/OSGI-INF/usertracking-service.xml
  106. Skipped modules/matterhorn-usertracking-impl/src/main/resources/OSGI-INF/usertracking-service-rest.xml (merged same as existing)
  107. Skipped modules/matterhorn-usertracking-impl/src/main/resources/META-INF/persistence.xml (merged same as existing)
  108. Auto-merging modules/matterhorn-usertracking-impl/src/main/java/org/opencastproject/usertracking/impl/UserTrackingServiceImpl.java
  109. CONFLICT (content): Merge conflict in modules/matterhorn-usertracking-impl/src/main/java/org/opencastproject/usertracking/impl/UserTrackingServiceImpl.java
  110. Auto-merging modules/matterhorn-usertracking-impl/src/main/java/org/opencastproject/usertracking/impl/UserSummaryListImpl.java
  111. CONFLICT (add/add): Merge conflict in modules/matterhorn-usertracking-impl/src/main/java/org/opencastproject/usertracking/impl/UserSummaryListImpl.java
  112. Auto-merging modules/matterhorn-usertracking-impl/src/main/java/org/opencastproject/usertracking/impl/UserSummaryImpl.java
  113. CONFLICT (add/add): Merge conflict in modules/matterhorn-usertracking-impl/src/main/java/org/opencastproject/usertracking/impl/UserSummaryImpl.java
  114. Auto-merging modules/matterhorn-usertracking-impl/src/main/java/org/opencastproject/usertracking/impl/UserActionListImpl.java
  115. CONFLICT (content): Merge conflict in modules/matterhorn-usertracking-impl/src/main/java/org/opencastproject/usertracking/impl/UserActionListImpl.java
  116. Auto-merging modules/matterhorn-usertracking-impl/src/main/java/org/opencastproject/usertracking/impl/UserActionImpl.java
  117. CONFLICT (content): Merge conflict in modules/matterhorn-usertracking-impl/src/main/java/org/opencastproject/usertracking/impl/UserActionImpl.java
  118. Auto-merging modules/matterhorn-usertracking-impl/src/main/java/org/opencastproject/usertracking/endpoint/UserTrackingRestService.java
  119. CONFLICT (content): Merge conflict in modules/matterhorn-usertracking-impl/src/main/java/org/opencastproject/usertracking/endpoint/UserTrackingRestService.java
  120. Auto-merging modules/matterhorn-usertracking-impl/src/main/java/org/opencastproject/usertracking/endpoint/StatsImpl.java
  121. Skipped modules/matterhorn-usertracking-impl/src/main/java/org/opencastproject/usertracking/endpoint/ReportItemImpl.java (merged same as existing)
  122. Auto-merging modules/matterhorn-usertracking-impl/src/main/java/org/opencastproject/usertracking/endpoint/ReportImpl.java
  123. CONFLICT (content): Merge conflict in modules/matterhorn-usertracking-impl/src/main/java/org/opencastproject/usertracking/endpoint/ReportImpl.java
  124. Auto-merging modules/matterhorn-usertracking-impl/src/main/java/org/opencastproject/usertracking/endpoint/FootprintsListImpl.java
  125. Skipped modules/matterhorn-usertracking-impl/src/main/java/org/opencastproject/usertracking/endpoint/FootprintImpl.java (merged same as existing)
  126. Auto-merging modules/matterhorn-usertracking-impl/pom.xml
  127. Skipped modules/matterhorn-usertracking-api/src/main/java/org/opencastproject/usertracking/api/package-info.java (merged same as existing)
  128. Auto-merging modules/matterhorn-usertracking-api/src/main/java/org/opencastproject/usertracking/api/UserTrackingService.java
  129. CONFLICT (content): Merge conflict in modules/matterhorn-usertracking-api/src/main/java/org/opencastproject/usertracking/api/UserTrackingService.java
  130. Auto-merging modules/matterhorn-usertracking-api/src/main/java/org/opencastproject/usertracking/api/UserTrackingException.java
  131. CONFLICT (rename/rename): Rename "modules/matterhorn-usertracking-service-api/src/main/java/org/opencastproject/usertracking/api/UserActionList.java"->"modules/matterhorn-usertracking-api/src/main/java/org/opencastproject/usertracking/api/UserSummaryList.java" in branch "Temporary merge branch 1" rename "modules/matterhorn-usertracking-service-api/src/main/java/org/opencastproject/usertracking/api/UserActionList.java"->"modules/matterhorn-common/src/main/java/org/opencastproject/fn/juc/package-info.java" in "Temporary merge branch 2" (left unresolved)
  132. Auto-merging modules/matterhorn-usertracking-api/src/main/java/org/opencastproject/usertracking/api/UserSummary.java
  133. CONFLICT (add/add): Merge conflict in modules/matterhorn-usertracking-api/src/main/java/org/opencastproject/usertracking/api/UserSummary.java
  134. Auto-merging modules/matterhorn-usertracking-api/src/main/java/org/opencastproject/usertracking/api/UserActionList.java
  135. CONFLICT (add/add): Merge conflict in modules/matterhorn-usertracking-api/src/main/java/org/opencastproject/usertracking/api/UserActionList.java
  136. Skipped modules/matterhorn-usertracking-api/src/main/java/org/opencastproject/usertracking/api/UserAction.java (merged same as existing)
  137. Auto-merging modules/matterhorn-usertracking-api/src/main/java/org/opencastproject/usertracking/api/Stats.java
  138. Auto-merging modules/matterhorn-usertracking-api/src/main/java/org/opencastproject/usertracking/api/ReportItem.java
  139. Auto-merging modules/matterhorn-usertracking-api/src/main/java/org/opencastproject/usertracking/api/Report.java
  140. Auto-merging modules/matterhorn-usertracking-api/src/main/java/org/opencastproject/usertracking/api/FootprintList.java
  141. Auto-merging modules/matterhorn-usertracking-api/src/main/java/org/opencastproject/usertracking/api/Footprint.java
  142. Auto-merging modules/matterhorn-usertracking-api/pom.xml
  143. Auto-merging modules/matterhorn-userdirectory/src/main/resources/OSGI-INF/group-role-provider.xml
  144. Auto-merging modules/matterhorn-userdirectory/src/main/resources/META-INF/persistence.xml
  145. Auto-merging modules/matterhorn-userdirectory/pom.xml
  146. Auto-merging modules/matterhorn-userdirectory-ldap/src/main/java/org/opencastproject/userdirectory/ldap/LdapUserProviderInstance.java
  147. CONFLICT (content): Merge conflict in modules/matterhorn-userdirectory-ldap/src/main/java/org/opencastproject/userdirectory/ldap/LdapUserProviderInstance.java
  148. Removing modules/matterhorn-userdirectory-ldap/src/main/java/org/opencastproject/userdirectory/ldap/Activator.java
  149. Auto-merging modules/matterhorn-userdirectory-ldap/pom.xml
  150. Auto-merging modules/matterhorn-textextractor-tesseract/src/test/java/org/opencastproject/analysis/text/TesseractTextExtractorTest.java
  151. CONFLICT (content): Merge conflict in modules/matterhorn-textextractor-tesseract/src/test/java/org/opencastproject/analysis/text/TesseractTextExtractorTest.java
  152. Auto-merging modules/matterhorn-textextractor-tesseract/src/main/java/org/opencastproject/textextractor/tesseract/TesseractTextExtractor.java
  153. Removing modules/matterhorn-textextractor-ocropus/src/test/resources/ocropus.html
  154. Removing modules/matterhorn-textextractor-ocropus/src/test/resources/image.jpg
  155. Removing modules/matterhorn-textextractor-ocropus/src/test/java/org/opencastproject/analysis/text/OcropusTextTest.java
  156. Removing modules/matterhorn-textextractor-ocropus/src/test/java/org/opencastproject/analysis/text/OcropusTextFrameTest.java
  157. Removing modules/matterhorn-textextractor-ocropus/src/test/java/org/opencastproject/analysis/text/OcropusTextExtractorTest.java
  158. Removing modules/matterhorn-textextractor-ocropus/src/main/resources/OSGI-INF/ocropus.xml
  159. Removing modules/matterhorn-textextractor-ocropus/src/main/java/org/opencastproject/textextractor/ocropus/OcropusTextLine.java
  160. Removing modules/matterhorn-textextractor-ocropus/src/main/java/org/opencastproject/textextractor/ocropus/OcropusTextFrame.java
  161. Removing modules/matterhorn-textextractor-ocropus/src/main/java/org/opencastproject/textextractor/ocropus/OcropusTextExtractor.java
  162. Auto-merging modules/matterhorn-textanalyzer-remote/src/main/java/org/opencastproject/textanalyzer/remote/TextAnalysisRemoteImpl.java
  163. CONFLICT (content): Merge conflict in modules/matterhorn-textanalyzer-remote/src/main/java/org/opencastproject/textanalyzer/remote/TextAnalysisRemoteImpl.java
  164. Auto-merging modules/matterhorn-textanalyzer-impl/src/main/java/org/opencastproject/textanalyzer/impl/endpoint/TextAnalysisRestEndpoint.java
  165. CONFLICT (content): Merge conflict in modules/matterhorn-textanalyzer-impl/src/main/java/org/opencastproject/textanalyzer/impl/endpoint/TextAnalysisRestEndpoint.java
  166. Auto-merging modules/matterhorn-textanalyzer-impl/src/main/java/org/opencastproject/textanalyzer/impl/TextAnalyzerServiceImpl.java
  167. CONFLICT (content): Merge conflict in modules/matterhorn-textanalyzer-impl/src/main/java/org/opencastproject/textanalyzer/impl/TextAnalyzerServiceImpl.java
  168. Removing modules/matterhorn-test-harness/test.txt
  169. Auto-merging modules/matterhorn-test-harness/src/main/resources/mp-test.zip
  170. CONFLICT (content): Merge conflict in modules/matterhorn-test-harness/src/main/resources/mp-test.zip
  171. Auto-merging modules/matterhorn-test-harness/src/main/resources/ingest.zip
  172. CONFLICT (content): Merge conflict in modules/matterhorn-test-harness/src/main/resources/ingest.zip
  173. Auto-merging modules/matterhorn-test-harness/src/main/resources/dublincore.xml
  174. Auto-merging modules/matterhorn-test-harness/src/main/resources/authorization/sample-series-1.xml
  175. Auto-merging modules/matterhorn-test-harness/src/main/java/org/opencastproject/remotetest/util/WorkflowUtils.java
  176. Auto-merging modules/matterhorn-test-harness/src/main/java/org/opencastproject/remotetest/util/Utils.java
  177. Auto-merging modules/matterhorn-test-harness/src/main/java/org/opencastproject/remotetest/util/JobUtils.java
  178. Auto-merging modules/matterhorn-test-harness/src/main/java/org/opencastproject/remotetest/util/CaptureUtils.java
  179. Skipped modules/matterhorn-test-harness/src/main/java/org/opencastproject/remotetest/server/YouTubePublicationRestEndpointTest.java (merged same as existing)
  180. Auto-merging modules/matterhorn-test-harness/src/main/java/org/opencastproject/remotetest/server/ScheduledCaptureTest.java
  181. Auto-merging modules/matterhorn-test-harness/src/main/java/org/opencastproject/remotetest/server/LtiAuthenticationTest.java
  182. Auto-merging modules/matterhorn-test-harness/src/main/java/org/opencastproject/remotetest/server/FailingPreProcessingWorkflowTest.java
  183. Auto-merging modules/matterhorn-test-harness/src/main/java/org/opencastproject/remotetest/server/DistributionDownloadRestEndpointTest.java
  184. Auto-merging modules/matterhorn-test-harness/src/main/java/org/opencastproject/remotetest/server/ComposerRestEndpointTest.java
  185. Auto-merging modules/matterhorn-test-harness/src/main/java/org/opencastproject/remotetest/capture/CaptureRestEndpointTest.java
  186. Auto-merging modules/matterhorn-test-harness/src/main/java/org/opencastproject/remotetest/ServerTests.java
  187. CONFLICT (content): Merge conflict in modules/matterhorn-test-harness/src/main/java/org/opencastproject/remotetest/ServerTests.java
  188. Auto-merging modules/matterhorn-static/src/main/java/org/opencastproject/fsresources/ResourceServlet.java
  189. Auto-merging modules/matterhorn-serviceregistry/src/test/java/org/opencastproject/serviceregistry/impl/ServiceRegistryJpaImplTest.java
  190. CONFLICT (content): Merge conflict in modules/matterhorn-serviceregistry/src/test/java/org/opencastproject/serviceregistry/impl/ServiceRegistryJpaImplTest.java
  191. Auto-merging modules/matterhorn-serviceregistry/src/test/java/org/opencastproject/serviceregistry/impl/ServiceRegistrationTest.java
  192. Auto-merging modules/matterhorn-serviceregistry/src/test/java/org/opencastproject/serviceregistry/impl/JobTest.java
  193. Auto-merging modules/matterhorn-serviceregistry/src/main/java/org/opencastproject/serviceregistry/impl/jmx/ServicesStatisticsMXBean.java
  194. CONFLICT (add/add): Merge conflict in modules/matterhorn-serviceregistry/src/main/java/org/opencastproject/serviceregistry/impl/jmx/ServicesStatisticsMXBean.java
  195. Auto-merging modules/matterhorn-serviceregistry/src/main/java/org/opencastproject/serviceregistry/impl/jmx/JobsStatisticsMXBean.java
  196. CONFLICT (add/add): Merge conflict in modules/matterhorn-serviceregistry/src/main/java/org/opencastproject/serviceregistry/impl/jmx/JobsStatisticsMXBean.java
  197. Auto-merging modules/matterhorn-serviceregistry/src/main/java/org/opencastproject/serviceregistry/impl/jmx/HostsStatisticsMXBean.java
  198. CONFLICT (add/add): Merge conflict in modules/matterhorn-serviceregistry/src/main/java/org/opencastproject/serviceregistry/impl/jmx/HostsStatisticsMXBean.java
  199. Auto-merging modules/matterhorn-serviceregistry/src/main/java/org/opencastproject/serviceregistry/impl/endpoint/ServiceRegistryEndpoint.java
  200. Auto-merging modules/matterhorn-serviceregistry/src/main/java/org/opencastproject/serviceregistry/impl/ServiceRegistryJpaImpl.java
  201. CONFLICT (content): Merge conflict in modules/matterhorn-serviceregistry/src/main/java/org/opencastproject/serviceregistry/impl/ServiceRegistryJpaImpl.java
  202. Auto-merging modules/matterhorn-serviceregistry/src/main/java/org/opencastproject/serviceregistry/impl/ServiceRegistrationJpaImpl.java
  203. CONFLICT (content): Merge conflict in modules/matterhorn-serviceregistry/src/main/java/org/opencastproject/serviceregistry/impl/ServiceRegistrationJpaImpl.java
  204. Auto-merging modules/matterhorn-serviceregistry/src/main/java/org/opencastproject/serviceregistry/impl/JobPropertyJpaImpl.java
  205. Auto-merging modules/matterhorn-serviceregistry/src/main/java/org/opencastproject/serviceregistry/impl/JobJpaImpl.java
  206. CONFLICT (content): Merge conflict in modules/matterhorn-serviceregistry/src/main/java/org/opencastproject/serviceregistry/impl/JobJpaImpl.java
  207. Auto-merging modules/matterhorn-serviceregistry/src/main/java/org/opencastproject/serviceregistry/impl/HostRegistrationJpaImpl.java
  208. CONFLICT (add/add): Merge conflict in modules/matterhorn-serviceregistry/src/main/java/org/opencastproject/serviceregistry/impl/HostRegistrationJpaImpl.java
  209. Auto-merging modules/matterhorn-serviceregistry-remote/src/main/java/org/opencastproject/serviceregistry/remote/ServiceRegistryRemoteImpl.java
  210. CONFLICT (content): Merge conflict in modules/matterhorn-serviceregistry-remote/src/main/java/org/opencastproject/serviceregistry/remote/ServiceRegistryRemoteImpl.java
  211. Auto-merging modules/matterhorn-series-service-remote/src/main/resources/OSGI-INF/series-service-remote.xml
  212. CONFLICT (add/add): Merge conflict in modules/matterhorn-series-service-remote/src/main/resources/OSGI-INF/series-service-remote.xml
  213. Auto-merging modules/matterhorn-series-service-remote/src/main/java/org/opencastproject/series/remote/SeriesServiceRemoteImpl.java
  214. CONFLICT (add/add): Merge conflict in modules/matterhorn-series-service-remote/src/main/java/org/opencastproject/series/remote/SeriesServiceRemoteImpl.java
  215. Auto-merging modules/matterhorn-series-service-impl/src/test/resources/dublincore2.xml
  216. CONFLICT (content): Merge conflict in modules/matterhorn-series-service-impl/src/test/resources/dublincore2.xml
  217. Auto-merging modules/matterhorn-series-service-impl/src/test/resources/dublincore.xml
  218. CONFLICT (content): Merge conflict in modules/matterhorn-series-service-impl/src/test/resources/dublincore.xml
  219. Auto-merging modules/matterhorn-series-service-impl/src/test/java/org/opencastproject/series/impl/solr/SeriesServiceSolrTest.java
  220. CONFLICT (content): Merge conflict in modules/matterhorn-series-service-impl/src/test/java/org/opencastproject/series/impl/solr/SeriesServiceSolrTest.java
  221. Auto-merging modules/matterhorn-series-service-impl/src/test/java/org/opencastproject/series/impl/persistence/SeriesServicePersistenceTest.java
  222. CONFLICT (content): Merge conflict in modules/matterhorn-series-service-impl/src/test/java/org/opencastproject/series/impl/persistence/SeriesServicePersistenceTest.java
  223. Auto-merging modules/matterhorn-series-service-impl/src/test/java/org/opencastproject/series/impl/SeriesServiceImplTest.java
  224. CONFLICT (content): Merge conflict in modules/matterhorn-series-service-impl/src/test/java/org/opencastproject/series/impl/SeriesServiceImplTest.java
  225. Auto-merging modules/matterhorn-series-service-impl/src/main/java/org/opencastproject/series/impl/solr/SolrFields.java
  226. Auto-merging modules/matterhorn-series-service-impl/src/main/java/org/opencastproject/series/impl/solr/SeriesServiceSolrIndex.java
  227. CONFLICT (content): Merge conflict in modules/matterhorn-series-service-impl/src/main/java/org/opencastproject/series/impl/solr/SeriesServiceSolrIndex.java
  228. Auto-merging modules/matterhorn-series-service-impl/src/main/java/org/opencastproject/series/impl/persistence/SeriesServiceDatabaseImpl.java
  229. Auto-merging modules/matterhorn-series-service-impl/src/main/java/org/opencastproject/series/impl/persistence/SeriesEntity.java
  230. Auto-merging modules/matterhorn-series-service-impl/src/main/java/org/opencastproject/series/impl/SeriesServiceImpl.java
  231. Auto-merging modules/matterhorn-series-service-impl/src/main/java/org/opencastproject/series/impl/SeriesServiceDatabase.java
  232. CONFLICT (content): Merge conflict in modules/matterhorn-series-service-impl/src/main/java/org/opencastproject/series/impl/SeriesServiceDatabase.java
  233. Auto-merging modules/matterhorn-series-service-impl/src/main/java/org/opencastproject/series/endpoint/SeriesRestService.java
  234. CONFLICT (content): Merge conflict in modules/matterhorn-series-service-impl/src/main/java/org/opencastproject/series/endpoint/SeriesRestService.java
  235. Auto-merging modules/matterhorn-series-service-api/src/main/java/org/opencastproject/series/api/SeriesService.java
  236. Auto-merging modules/matterhorn-series-service-api/src/main/java/org/opencastproject/series/api/SeriesQuery.java
  237. Auto-merging modules/matterhorn-security-openid/pom.xml
  238. CONFLICT (add/add): Merge conflict in modules/matterhorn-security-openid/pom.xml
  239. Auto-merging modules/matterhorn-security-ldap/pom.xml
  240. CONFLICT (add/add): Merge conflict in modules/matterhorn-security-ldap/pom.xml
  241. Auto-merging modules/matterhorn-security-cas/pom.xml
  242. Auto-merging modules/matterhorn-search-service-remote/src/main/java/org/opencastproject/search/remote/SearchServiceRemoteImpl.java
  243. CONFLICT (content): Merge conflict in modules/matterhorn-search-service-remote/src/main/java/org/opencastproject/search/remote/SearchServiceRemoteImpl.java
  244. Auto-merging modules/matterhorn-search-service-impl/src/test/java/org/opencastproject/search/impl/persistence/SearchServicePersistenceTest.java
  245. CONFLICT (content): Merge conflict in modules/matterhorn-search-service-impl/src/test/java/org/opencastproject/search/impl/persistence/SearchServicePersistenceTest.java
  246. Auto-merging modules/matterhorn-search-service-impl/src/test/java/org/opencastproject/search/impl/SearchServiceImplTest.java
  247. CONFLICT (content): Merge conflict in modules/matterhorn-search-service-impl/src/test/java/org/opencastproject/search/impl/SearchServiceImplTest.java
  248. Auto-merging modules/matterhorn-search-service-impl/src/test/java/org/opencastproject/feed/impl/FeedImplTest.java
  249. CONFLICT (content): Merge conflict in modules/matterhorn-search-service-impl/src/test/java/org/opencastproject/feed/impl/FeedImplTest.java
  250. Auto-merging modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/search/impl/solr/SolrRequester.java
  251. CONFLICT (content): Merge conflict in modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/search/impl/solr/SolrRequester.java
  252. Auto-merging modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/search/impl/solr/SolrIndexManager.java
  253. CONFLICT (content): Merge conflict in modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/search/impl/solr/SolrIndexManager.java
  254. Auto-merging modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/search/impl/persistence/SearchServiceDatabaseImpl.java
  255. Auto-merging modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/search/impl/persistence/SearchEntity.java
  256. Auto-merging modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/search/impl/SearchServiceImpl.java
  257. CONFLICT (content): Merge conflict in modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/search/impl/SearchServiceImpl.java
  258. Auto-merging modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/search/endpoint/SearchRestService.java
  259. CONFLICT (content): Merge conflict in modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/search/endpoint/SearchRestService.java
  260. Auto-merging modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/feed/impl/SeriesFeedService.java
  261. CONFLICT (content): Merge conflict in modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/feed/impl/SeriesFeedService.java
  262. Auto-merging modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/feed/impl/RomeRssFeed.java
  263. Auto-merging modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/feed/impl/RomeAtomFeed.java
  264. CONFLICT (add/add): Merge conflict in modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/feed/impl/RomeAtomFeed.java
  265. Auto-merging modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/feed/impl/LinkImpl.java
  266. Auto-merging modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/feed/impl/LatestFeedService.java
  267. CONFLICT (content): Merge conflict in modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/feed/impl/LatestFeedService.java
  268. Auto-merging modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/feed/impl/FeedServlet.java
  269. CONFLICT (content): Merge conflict in modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/feed/impl/FeedServlet.java
  270. Auto-merging modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/feed/impl/FeedInfo.java
  271. CONFLICT (content): Merge conflict in modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/feed/impl/FeedInfo.java
  272. Auto-merging modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/feed/impl/FeedImpl.java
  273. CONFLICT (content): Merge conflict in modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/feed/impl/FeedImpl.java
  274. Auto-merging modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/feed/impl/EnclosureImpl.java
  275. CONFLICT (content): Merge conflict in modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/feed/impl/EnclosureImpl.java
  276. Auto-merging modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/feed/impl/CustomFeedService.java
  277. CONFLICT (content): Merge conflict in modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/feed/impl/CustomFeedService.java
  278. Auto-merging modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/feed/impl/AbstractFeedService.java
  279. CONFLICT (content): Merge conflict in modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/feed/impl/AbstractFeedService.java
  280. Auto-merging modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/feed/impl/AbstractFeedGenerator.java
  281. CONFLICT (content): Merge conflict in modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/feed/impl/AbstractFeedGenerator.java
  282. Auto-merging modules/matterhorn-search-service-feeds/src/main/java/org/opencastproject/feed/scanner/FeedRegistrationScanner.java
  283. CONFLICT (content): Merge conflict in modules/matterhorn-search-service-feeds/src/main/java/org/opencastproject/feed/scanner/FeedRegistrationScanner.java
  284. Auto-merging modules/matterhorn-search-service-api/src/main/java/org/opencastproject/search/api/SearchService.java
  285. Auto-merging modules/matterhorn-search-service-api/src/main/java/org/opencastproject/search/api/SearchResultItemImpl.java
  286. Auto-merging modules/matterhorn-search-service-api/src/main/java/org/opencastproject/search/api/SearchQuery.java
  287. CONFLICT (content): Merge conflict in modules/matterhorn-search-service-api/src/main/java/org/opencastproject/search/api/SearchQuery.java
  288. Auto-merging modules/matterhorn-search-service-api/src/main/java/org/opencastproject/feed/api/Link.java
  289. Auto-merging modules/matterhorn-search-service-api/src/main/java/org/opencastproject/feed/api/FeedGenerator.java
  290. CONFLICT (content): Merge conflict in modules/matterhorn-search-service-api/src/main/java/org/opencastproject/feed/api/FeedGenerator.java
  291. Auto-merging modules/matterhorn-search-service-api/src/main/java/org/opencastproject/feed/api/Feed.java
  292. Auto-merging modules/matterhorn-search-service-api/src/main/java/org/opencastproject/feed/api/Enclosure.java
  293. Auto-merging modules/matterhorn-scheduler-remote/src/main/java/org/opencastproject/scheduler/remote/SchedulerServiceRemoteImpl.java
  294. CONFLICT (add/add): Merge conflict in modules/matterhorn-scheduler-remote/src/main/java/org/opencastproject/scheduler/remote/SchedulerServiceRemoteImpl.java
  295. CONFLICT (rename/rename): Rename modules/matterhorn-textextractor-ocropus/pom.xml->modules/matterhorn-scheduler-remote/pom.xml in Temporary merge branch 2. Rename modules/matterhorn-export-distribution-ui/pom.xml->modules/matterhorn-scheduler-remote/pom.xml in Temporary merge branch 1
  296. Auto-merging modules/matterhorn-scheduler-impl/src/test/java/org/opencastproject/scheduler/impl/solr/SchedulerServiceSolrIndexTest.java
  297. Auto-merging modules/matterhorn-scheduler-impl/src/test/java/org/opencastproject/scheduler/impl/SchedulerServiceImplTest.java
  298. CONFLICT (content): Merge conflict in modules/matterhorn-scheduler-impl/src/test/java/org/opencastproject/scheduler/impl/SchedulerServiceImplTest.java
  299. Skipped modules/matterhorn-scheduler-impl/src/main/resources/OSGI-INF/scheduler-service.xml (merged same as existing)
  300. Auto-merging modules/matterhorn-scheduler-impl/src/main/java/org/opencastproject/scheduler/impl/solr/SchedulerServiceSolrIndex.java
  301. CONFLICT (content): Merge conflict in modules/matterhorn-scheduler-impl/src/main/java/org/opencastproject/scheduler/impl/solr/SchedulerServiceSolrIndex.java
  302. Auto-merging modules/matterhorn-scheduler-impl/src/main/java/org/opencastproject/scheduler/impl/persistence/SchedulerServiceDatabaseImpl.java
  303. Auto-merging modules/matterhorn-scheduler-impl/src/main/java/org/opencastproject/scheduler/impl/persistence/EventEntity.java
  304. Auto-merging modules/matterhorn-scheduler-impl/src/main/java/org/opencastproject/scheduler/impl/SchedulerServiceIndex.java
  305. Auto-merging modules/matterhorn-scheduler-impl/src/main/java/org/opencastproject/scheduler/impl/SchedulerServiceImpl.java
  306. CONFLICT (content): Merge conflict in modules/matterhorn-scheduler-impl/src/main/java/org/opencastproject/scheduler/impl/SchedulerServiceImpl.java
  307. Auto-merging modules/matterhorn-scheduler-impl/src/main/java/org/opencastproject/scheduler/endpoint/SchedulerRestService.java
  308. CONFLICT (content): Merge conflict in modules/matterhorn-scheduler-impl/src/main/java/org/opencastproject/scheduler/endpoint/SchedulerRestService.java
  309. Auto-merging modules/matterhorn-scheduler-impl/pom.xml
  310. Auto-merging modules/matterhorn-scheduler-api/src/main/java/org/opencastproject/scheduler/api/SchedulerService.java
  311. CONFLICT (content): Merge conflict in modules/matterhorn-scheduler-api/src/main/java/org/opencastproject/scheduler/api/SchedulerService.java
  312. Auto-merging modules/matterhorn-scheduler-api/src/main/java/org/opencastproject/scheduler/api/SchedulerQuery.java
  313. CONFLICT (content): Merge conflict in modules/matterhorn-scheduler-api/src/main/java/org/opencastproject/scheduler/api/SchedulerQuery.java
  314. Auto-merging modules/matterhorn-runtime-info-ui/src/main/resources/ui/welcome.html
  315. CONFLICT (content): Merge conflict in modules/matterhorn-runtime-info-ui/src/main/resources/ui/welcome.html
  316. Auto-merging modules/matterhorn-runtime-info-ui/src/main/resources/ui/rest_docs.html
  317. CONFLICT (content): Merge conflict in modules/matterhorn-runtime-info-ui/src/main/resources/ui/rest_docs.html
  318. Auto-merging modules/matterhorn-runtime-info-ui/src/main/resources/ui/login.html
  319. Auto-merging modules/matterhorn-runtime-info-ui/src/main/java/org/opencastproject/runtimeinfo/rest/RestParamData.java
  320. Auto-merging modules/matterhorn-runtime-info-ui/src/main/java/org/opencastproject/runtimeinfo/rest/RestEndpointData.java
  321. Auto-merging modules/matterhorn-runtime-info-ui/src/main/java/org/opencastproject/runtimeinfo/RuntimeInfo.java
  322. CONFLICT (content): Merge conflict in modules/matterhorn-runtime-info-ui/src/main/java/org/opencastproject/runtimeinfo/RuntimeInfo.java
  323. Auto-merging modules/matterhorn-runtime-info-ui/src/main/java/org/opencastproject/runtimeinfo/Activator.java
  324. CONFLICT (content): Merge conflict in modules/matterhorn-runtime-info-ui/src/main/java/org/opencastproject/runtimeinfo/Activator.java
  325. Auto-merging modules/matterhorn-runtime-dependencies/pom.xml
  326. CONFLICT (content): Merge conflict in modules/matterhorn-runtime-dependencies/pom.xml
  327. Skipped modules/matterhorn-publication-service-youtube/src/test/resources/mpeg7.xml (merged same as existing)
  328. Skipped modules/matterhorn-publication-service-youtube/src/test/resources/mediapackage.xml (merged same as existing)
  329. Auto-merging modules/matterhorn-publication-service-youtube/src/test/resources/dublincore.xml
  330. Skipped modules/matterhorn-publication-service-youtube/src/test/resources/attachment.txt (merged same as existing)
  331. Auto-merging modules/matterhorn-publication-service-youtube/src/test/java/org/opencastproject/publication/youtube/YouTubePublicationServiceTest.java
  332. CONFLICT (content): Merge conflict in modules/matterhorn-publication-service-youtube/src/test/java/org/opencastproject/publication/youtube/YouTubePublicationServiceTest.java
  333. Skipped modules/matterhorn-publication-service-youtube/src/main/resources/OSGI-INF/publication-service-youtube.xml (merged same as existing)
  334. Skipped modules/matterhorn-publication-service-youtube/src/main/java/org/opencastproject/publication/youtube/package-info.java (merged same as existing)
  335. Auto-merging modules/matterhorn-publication-service-youtube/src/main/java/org/opencastproject/publication/youtube/endpoint/YouTubePublicationRestService.java
  336. CONFLICT (content): Merge conflict in modules/matterhorn-publication-service-youtube/src/main/java/org/opencastproject/publication/youtube/endpoint/YouTubePublicationRestService.java
  337. Auto-merging modules/matterhorn-publication-service-youtube/src/main/java/org/opencastproject/publication/youtube/YouTubePublicationServiceImpl.java
  338. CONFLICT (content): Merge conflict in modules/matterhorn-publication-service-youtube/src/main/java/org/opencastproject/publication/youtube/YouTubePublicationServiceImpl.java
  339. Auto-merging modules/matterhorn-publication-service-youtube/src/main/java/org/opencastproject/publication/youtube/YouTubePublicationContextStrategy.java
  340. CONFLICT (content): Merge conflict in modules/matterhorn-publication-service-youtube/src/main/java/org/opencastproject/publication/youtube/YouTubePublicationContextStrategy.java
  341. Skipped modules/matterhorn-publication-service-youtube/src/main/java/org/opencastproject/deliver/youtube/package.html (merged same as existing)
  342. Auto-merging modules/matterhorn-publication-service-youtube/pom.xml
  343. CONFLICT (content): Merge conflict in modules/matterhorn-publication-service-youtube/pom.xml
  344. Auto-merging modules/matterhorn-publication-service-youtube-remote/pom.xml
  345. Auto-merging modules/matterhorn-publication-service-api/src/main/java/org/opencastproject/publication/api/YouTubePublicationService.java
  346. CONFLICT (add/add): Merge conflict in modules/matterhorn-publication-service-api/src/main/java/org/opencastproject/publication/api/YouTubePublicationService.java
  347. Auto-merging modules/matterhorn-publication-service-api/pom.xml
  348. CONFLICT (add/add): Merge conflict in modules/matterhorn-publication-service-api/pom.xml
  349. Auto-merging modules/matterhorn-oaipmh/src/test/java/org/opencastproject/oaipmh/server/UniversalNamespaceResolver.java
  350. Auto-merging modules/matterhorn-oaipmh/src/main/java/org/opencastproject/oaipmh/server/OaiXmlGen.java
  351. CONFLICT (content): Merge conflict in modules/matterhorn-oaipmh/src/main/java/org/opencastproject/oaipmh/server/OaiXmlGen.java
  352. Auto-merging modules/matterhorn-oaipmh/src/main/java/org/opencastproject/oaipmh/harvester/ListRecordsResponse.java
  353. Auto-merging modules/matterhorn-metadata/src/main/java/org/opencastproject/metadata/StaticMetadataServiceMediaPackageImpl.java
  354. CONFLICT (content): Merge conflict in modules/matterhorn-metadata/src/main/java/org/opencastproject/metadata/StaticMetadataServiceMediaPackageImpl.java
  355. Auto-merging modules/matterhorn-mediapackage-ui/src/main/resources/ui/scripts/mediaPackage.js
  356. CONFLICT (content): Merge conflict in modules/matterhorn-mediapackage-ui/src/main/resources/ui/scripts/mediaPackage.js
  357. Auto-merging modules/matterhorn-mediapackage-ui/src/main/resources/ui/scripts/jquery.mpeditor.js
  358. CONFLICT (content): Merge conflict in modules/matterhorn-mediapackage-ui/src/main/resources/ui/scripts/jquery.mpeditor.js
  359. Auto-merging modules/matterhorn-mediapackage-ui/pom.xml
  360. Auto-merging modules/matterhorn-mediapackage-manipulator/src/main/java/org/opencastproject/manipulator/rest/MediapackageRestService.java
  361. Auto-merging modules/matterhorn-lti/src/main/resources/tools/player/index.html
  362. Auto-merging modules/matterhorn-lti/pom.xml
  363. Auto-merging modules/matterhorn-load-test/src/main/java/org/opencastproject/loadtest/impl/IngestJob.java
  364. Auto-merging modules/matterhorn-load-test/src/main/java/org/opencastproject/loadtest/endpoint/LoadTestingRestService.java
  365. Auto-merging modules/matterhorn-load-test-engage/src/main/java/org/opencastproject/loadtest/engage/Main.java
  366. CONFLICT (content): Merge conflict in modules/matterhorn-load-test-engage/src/main/java/org/opencastproject/loadtest/engage/Main.java
  367. Auto-merging modules/matterhorn-load-test-engage/src/main/java/org/opencastproject/loadtest/engage/LoadTestEngage.java
  368. CONFLICT (content): Merge conflict in modules/matterhorn-load-test-engage/src/main/java/org/opencastproject/loadtest/engage/LoadTestEngage.java
  369. Auto-merging modules/matterhorn-load-test-engage/pom.xml
  370. Auto-merging modules/matterhorn-kernel/src/test/java/org/opencastproject/kernel/security/TrustedHttpClientImplTest.java
  371. CONFLICT (content): Merge conflict in modules/matterhorn-kernel/src/test/java/org/opencastproject/kernel/security/TrustedHttpClientImplTest.java
  372. Auto-merging modules/matterhorn-kernel/src/main/resources/OSGI-INF/user-and-role-directory-service.xml
  373. Auto-merging modules/matterhorn-kernel/src/main/resources/OSGI-INF/https-filter.xml
  374. CONFLICT (add/add): Merge conflict in modules/matterhorn-kernel/src/main/resources/OSGI-INF/https-filter.xml
  375. Auto-merging modules/matterhorn-kernel/src/main/resources/META-INF/persistence.xml
  376. CONFLICT (add/add): Merge conflict in modules/matterhorn-kernel/src/main/resources/META-INF/persistence.xml
  377. Auto-merging modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/userdirectory/UserAndRoleDirectoryServiceImpl.java
  378. CONFLICT (content): Merge conflict in modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/userdirectory/UserAndRoleDirectoryServiceImpl.java
  379. Auto-merging modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/userdirectory/InMemoryUserAndRoleProvider.java
  380. CONFLICT (content): Merge conflict in modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/userdirectory/InMemoryUserAndRoleProvider.java
  381. Auto-merging modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/security/persistence/OrganizationDatabaseImpl.java
  382. CONFLICT (add/add): Merge conflict in modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/security/persistence/OrganizationDatabaseImpl.java
  383. Auto-merging modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/security/persistence/OrganizationDatabaseException.java
  384. CONFLICT (add/add): Merge conflict in modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/security/persistence/OrganizationDatabaseException.java
  385. Auto-merging modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/security/persistence/OrganizationDatabase.java
  386. CONFLICT (add/add): Merge conflict in modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/security/persistence/OrganizationDatabase.java
  387. Auto-merging modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/security/persistence/JpaOrganization.java
  388. CONFLICT (add/add): Merge conflict in modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/security/persistence/JpaOrganization.java
  389. Auto-merging modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/security/TrustedHttpClientImpl.java
  390. CONFLICT (content): Merge conflict in modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/security/TrustedHttpClientImpl.java
  391. Auto-merging modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/security/TrustedAnonymousAuthenticationFilter.java
  392. CONFLICT (add/add): Merge conflict in modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/security/TrustedAnonymousAuthenticationFilter.java
  393. Auto-merging modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/security/SecurityServiceSpringImpl.java
  394. CONFLICT (content): Merge conflict in modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/security/SecurityServiceSpringImpl.java
  395. Auto-merging modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/security/RemoteUserAndOrganizationFilter.java
  396. CONFLICT (add/add): Merge conflict in modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/security/RemoteUserAndOrganizationFilter.java
  397. Auto-merging modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/security/OrganizationFilter.java
  398. Auto-merging modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/security/OrganizationDirectoryServiceImpl.java
  399. CONFLICT (content): Merge conflict in modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/security/OrganizationDirectoryServiceImpl.java
  400. Auto-merging modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/security/LtiLaunchAuthenticationHandler.java
  401. CONFLICT (content): Merge conflict in modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/security/LtiLaunchAuthenticationHandler.java
  402. Auto-merging modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/rest/RestPublisher.java
  403. CONFLICT (content): Merge conflict in modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/rest/RestPublisher.java
  404. Auto-merging modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/rest/CurrentJobFilter.java
  405. CONFLICT (add/add): Merge conflict in modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/rest/CurrentJobFilter.java
  406. Auto-merging modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/mail/SmtpService.java
  407. CONFLICT (add/add): Merge conflict in modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/mail/SmtpService.java
  408. Auto-merging modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/http/impl/HttpClientImpl.java
  409. CONFLICT (content): Merge conflict in modules/matterhorn-kernel/src/main/java/org/opencastproject/kernel/http/impl/HttpClientImpl.java
  410. Auto-merging modules/matterhorn-kernel/pom.xml
  411. CONFLICT (content): Merge conflict in modules/matterhorn-kernel/pom.xml
  412. Auto-merging modules/matterhorn-inspection-service-remote/src/main/java/org/opencastproject/inspection/remote/MediaInspectionServiceRemoteImpl.java
  413. Auto-merging modules/matterhorn-inspection-service-impl/src/test/java/org/opencastproject/inspection/impl/MediaInspectionServiceImplTest.java
  414. CONFLICT (content): Merge conflict in modules/matterhorn-inspection-service-impl/src/test/java/org/opencastproject/inspection/impl/MediaInspectionServiceImplTest.java
  415. Auto-merging modules/matterhorn-inspection-service-impl/src/main/java/org/opencastproject/inspection/impl/endpoints/MediaInspectionRestEndpoint.java
  416. CONFLICT (content): Merge conflict in modules/matterhorn-inspection-service-impl/src/main/java/org/opencastproject/inspection/impl/endpoints/MediaInspectionRestEndpoint.java
  417. Auto-merging modules/matterhorn-inspection-service-impl/src/main/java/org/opencastproject/inspection/impl/api/util/CmdlineMediaAnalyzerSupport.java
  418. CONFLICT (content): Merge conflict in modules/matterhorn-inspection-service-impl/src/main/java/org/opencastproject/inspection/impl/api/util/CmdlineMediaAnalyzerSupport.java
  419. Auto-merging modules/matterhorn-inspection-service-impl/src/main/java/org/opencastproject/inspection/impl/MediaInspectionServiceImpl.java
  420. CONFLICT (content): Merge conflict in modules/matterhorn-inspection-service-impl/src/main/java/org/opencastproject/inspection/impl/MediaInspectionServiceImpl.java
  421. Auto-merging modules/matterhorn-inspection-service-impl/src/main/java/org/opencastproject/inspection/impl/MediaInfoAnalyzer.java
  422. Auto-merging modules/matterhorn-inspection-service-impl/pom.xml
  423. Auto-merging modules/matterhorn-ingest-service-impl/src/test/resources/vonly.mov
  424. Auto-merging modules/matterhorn-ingest-service-impl/src/test/resources/testingZip.zip
  425. CONFLICT (content): Merge conflict in modules/matterhorn-ingest-service-impl/src/test/resources/testingZip.zip
  426. Auto-merging modules/matterhorn-ingest-service-impl/src/test/resources/series-dublincore.xml
  427. Auto-merging modules/matterhorn-ingest-service-impl/src/test/resources/dublincore.xml
  428. Auto-merging modules/matterhorn-ingest-service-impl/src/test/resources/data.zip
  429. CONFLICT (content): Merge conflict in modules/matterhorn-ingest-service-impl/src/test/resources/data.zip
  430. Auto-merging modules/matterhorn-ingest-service-impl/src/test/resources/data.old.zip
  431. CONFLICT (add/add): Merge conflict in modules/matterhorn-ingest-service-impl/src/test/resources/data.old.zip
  432. Auto-merging modules/matterhorn-ingest-service-impl/src/test/resources/av.mov
  433. Auto-merging modules/matterhorn-ingest-service-impl/src/test/resources/aonly.mov
  434. Auto-merging modules/matterhorn-ingest-service-impl/src/test/java/org/opencastproject/ingest/impl/IngestServiceImplTest.java
  435. CONFLICT (content): Merge conflict in modules/matterhorn-ingest-service-impl/src/test/java/org/opencastproject/ingest/impl/IngestServiceImplTest.java
  436. Auto-merging modules/matterhorn-ingest-service-impl/src/main/resources/OSGI-INF/ingest-service.xml
  437. Auto-merging modules/matterhorn-ingest-service-impl/src/main/resources/OSGI-INF/ingest-service-rest.xml
  438. CONFLICT (content): Merge conflict in modules/matterhorn-ingest-service-impl/src/main/resources/OSGI-INF/ingest-service-rest.xml
  439. Auto-merging modules/matterhorn-ingest-service-impl/src/main/java/org/opencastproject/ingest/scanner/Ingestor.java
  440. CONFLICT (content): Merge conflict in modules/matterhorn-ingest-service-impl/src/main/java/org/opencastproject/ingest/scanner/Ingestor.java
  441. Auto-merging modules/matterhorn-ingest-service-impl/src/main/java/org/opencastproject/ingest/impl/jmx/IngestStatisticsMXBean.java
  442. CONFLICT (add/add): Merge conflict in modules/matterhorn-ingest-service-impl/src/main/java/org/opencastproject/ingest/impl/jmx/IngestStatisticsMXBean.java
  443. Auto-merging modules/matterhorn-ingest-service-impl/src/main/java/org/opencastproject/ingest/impl/ZipEntryInputStream.java
  444. CONFLICT (add/add): Merge conflict in modules/matterhorn-ingest-service-impl/src/main/java/org/opencastproject/ingest/impl/ZipEntryInputStream.java
  445. Auto-merging modules/matterhorn-ingest-service-impl/src/main/java/org/opencastproject/ingest/impl/IngestServiceImpl.java
  446. CONFLICT (content): Merge conflict in modules/matterhorn-ingest-service-impl/src/main/java/org/opencastproject/ingest/impl/IngestServiceImpl.java
  447. Auto-merging modules/matterhorn-ingest-service-impl/src/main/java/org/opencastproject/ingest/endpoint/UploadJob.java
  448. Auto-merging modules/matterhorn-ingest-service-impl/src/main/java/org/opencastproject/ingest/endpoint/IngestRestService.java
  449. CONFLICT (content): Merge conflict in modules/matterhorn-ingest-service-impl/src/main/java/org/opencastproject/ingest/endpoint/IngestRestService.java
  450. Auto-merging modules/matterhorn-ingest-service-impl/pom.xml
  451. Auto-merging modules/matterhorn-ingest-service-api/src/main/java/org/opencastproject/ingest/api/IngestService.java
  452. Auto-merging modules/matterhorn-ingest-service-api/pom.xml
  453. Auto-merging modules/matterhorn-gstreamer-service-remote/src/main/java/org/opencastproject/gstreamer/remote/GStreamerServiceRemoteImpl.java
  454. CONFLICT (content): Merge conflict in modules/matterhorn-gstreamer-service-remote/src/main/java/org/opencastproject/gstreamer/remote/GStreamerServiceRemoteImpl.java
  455. Auto-merging modules/matterhorn-gstreamer-service-impl/src/main/java/org/opencastproject/gstreamer/service/impl/endpoint/GStreamerRestService.java
  456. Auto-merging modules/matterhorn-fileupload/src/main/java/org/opencastproject/fileupload/service/FileUploadServiceImpl.java
  457. CONFLICT (content): Merge conflict in modules/matterhorn-fileupload/src/main/java/org/opencastproject/fileupload/service/FileUploadServiceImpl.java
  458. Auto-merging modules/matterhorn-fileupload/src/main/java/org/opencastproject/fileupload/service/FileUploadServiceCleaner.java
  459. CONFLICT (add/add): Merge conflict in modules/matterhorn-fileupload/src/main/java/org/opencastproject/fileupload/service/FileUploadServiceCleaner.java
  460. Auto-merging modules/matterhorn-fileupload/src/main/java/org/opencastproject/fileupload/api/job/Payload.java
  461. CONFLICT (content): Merge conflict in modules/matterhorn-fileupload/src/main/java/org/opencastproject/fileupload/api/job/Payload.java
  462. Auto-merging modules/matterhorn-fileupload/src/main/java/org/opencastproject/fileupload/api/job/FileUploadJob.java
  463. CONFLICT (content): Merge conflict in modules/matterhorn-fileupload/src/main/java/org/opencastproject/fileupload/api/job/FileUploadJob.java
  464. Auto-merging modules/matterhorn-fileupload/src/main/java/org/opencastproject/fileupload/api/job/Chunk.java
  465. CONFLICT (content): Merge conflict in modules/matterhorn-fileupload/src/main/java/org/opencastproject/fileupload/api/job/Chunk.java
  466. Auto-merging modules/matterhorn-fileupload/src/main/java/org/opencastproject/fileupload/api/FileUploadService.java
  467. CONFLICT (content): Merge conflict in modules/matterhorn-fileupload/src/main/java/org/opencastproject/fileupload/api/FileUploadService.java
  468. Auto-merging modules/matterhorn-fileupload/pom.xml
  469. CONFLICT (content): Merge conflict in modules/matterhorn-fileupload/pom.xml
  470. CONFLICT (rename/rename): Rename "modules/matterhorn-distribution-service-youtube/src/test/resources/media.mov"->"modules/matterhorn-export-impl/src/test/resources/av.mov" in branch "Temporary merge branch 1" rename "modules/matterhorn-distribution-service-youtube/src/test/resources/media.mov"->"modules/matterhorn-composer-ffmpeg/src/test/resources/av.mov" in "Temporary merge branch 2" (left unresolved)
  471. Auto-merging modules/matterhorn-episode-service-impl/src/test/resources/series-dublincore.xml
  472. CONFLICT (content): Merge conflict in modules/matterhorn-episode-service-impl/src/test/resources/series-dublincore.xml
  473. Auto-merging modules/matterhorn-episode-service-impl/src/test/resources/series-dublincore-c.xml
  474. CONFLICT (add/add): Merge conflict in modules/matterhorn-episode-service-impl/src/test/resources/series-dublincore-c.xml
  475. Auto-merging modules/matterhorn-episode-service-impl/src/test/resources/series-dublincore-b.xml
  476. CONFLICT (add/add): Merge conflict in modules/matterhorn-episode-service-impl/src/test/resources/series-dublincore-b.xml
  477. Auto-merging modules/matterhorn-episode-service-impl/src/test/resources/series-dublincore-a.xml
  478. CONFLICT (add/add): Merge conflict in modules/matterhorn-episode-service-impl/src/test/resources/series-dublincore-a.xml
  479. Auto-merging modules/matterhorn-episode-service-impl/src/test/resources/dublincore.xml
  480. CONFLICT (content): Merge conflict in modules/matterhorn-episode-service-impl/src/test/resources/dublincore.xml
  481. Auto-merging modules/matterhorn-episode-service-impl/src/test/resources/dublincore-c.xml
  482. CONFLICT (add/add): Merge conflict in modules/matterhorn-episode-service-impl/src/test/resources/dublincore-c.xml
  483. Auto-merging modules/matterhorn-episode-service-impl/src/test/resources/dublincore-b.xml
  484. CONFLICT (add/add): Merge conflict in modules/matterhorn-episode-service-impl/src/test/resources/dublincore-b.xml
  485. Auto-merging modules/matterhorn-episode-service-impl/src/test/resources/dublincore-a.xml
  486. CONFLICT (add/add): Merge conflict in modules/matterhorn-episode-service-impl/src/test/resources/dublincore-a.xml
  487. Auto-merging modules/matterhorn-episode-service-impl/src/test/java/org/opencastproject/episode/persistence/EpisodeServicePersistenceTest.java
  488. CONFLICT (add/add): Merge conflict in modules/matterhorn-episode-service-impl/src/test/java/org/opencastproject/episode/persistence/EpisodeServicePersistenceTest.java
  489. Auto-merging modules/matterhorn-episode-service-impl/src/test/java/org/opencastproject/episode/impl/EpisodeServiceImplTest.java
  490. CONFLICT (content): Merge conflict in modules/matterhorn-episode-service-impl/src/test/java/org/opencastproject/episode/impl/EpisodeServiceImplTest.java
  491. Auto-merging modules/matterhorn-episode-service-impl/src/test/java/org/opencastproject/episode/EpisodeServiceTestEnv.java
  492. CONFLICT (add/add): Merge conflict in modules/matterhorn-episode-service-impl/src/test/java/org/opencastproject/episode/EpisodeServiceTestEnv.java
  493. Auto-merging modules/matterhorn-episode-service-impl/src/main/resources/solr/conf/schema.xml
  494. CONFLICT (content): Merge conflict in modules/matterhorn-episode-service-impl/src/main/resources/solr/conf/schema.xml
  495. Auto-merging modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/impl/solr/SolrRequester.java
  496. CONFLICT (content): Merge conflict in modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/impl/solr/SolrRequester.java
  497. Auto-merging modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/impl/solr/SolrIndexManager.java
  498. CONFLICT (content): Merge conflict in modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/impl/solr/SolrIndexManager.java
  499. Auto-merging modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/impl/solr/Schema.java
  500. Auto-merging modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/impl/persistence/VersionClaimDto.java
  501. CONFLICT (add/add): Merge conflict in modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/impl/persistence/VersionClaimDto.java
  502. Auto-merging modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/impl/persistence/EpisodeServiceDatabaseException.java
  503. CONFLICT (add/add): Merge conflict in modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/impl/persistence/EpisodeServiceDatabaseException.java
  504. Auto-merging modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/impl/persistence/AssetDto.java
  505. CONFLICT (add/add): Merge conflict in modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/impl/persistence/AssetDto.java
  506. Auto-merging modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/impl/persistence/Asset.java
  507. CONFLICT (add/add): Merge conflict in modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/impl/persistence/Asset.java
  508. Auto-merging modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/impl/jmx/ElementStoreMXBean.java
  509. CONFLICT (add/add): Merge conflict in modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/impl/jmx/ElementStoreMXBean.java
  510. Auto-merging modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/impl/jmx/ElementStoreBean.java
  511. CONFLICT (add/add): Merge conflict in modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/impl/jmx/ElementStoreBean.java
  512. Auto-merging modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/impl/elementstore/ElementStoreException.java
  513. CONFLICT (add/add): Merge conflict in modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/impl/elementstore/ElementStoreException.java
  514. Auto-merging modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/impl/elementstore/ElementStore.java
  515. CONFLICT (add/add): Merge conflict in modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/impl/elementstore/ElementStore.java
  516. Auto-merging modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/impl/EpisodeServicePublisher.java
  517. CONFLICT (add/add): Merge conflict in modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/impl/EpisodeServicePublisher.java
  518. Auto-merging modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/impl/EpisodeServiceImpl.java
  519. CONFLICT (content): Merge conflict in modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/impl/EpisodeServiceImpl.java
  520. Auto-merging modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/endpoint/OsgiEpisodeServiceRestEndpoint.java
  521. CONFLICT (add/add): Merge conflict in modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/endpoint/OsgiEpisodeServiceRestEndpoint.java
  522. Auto-merging modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/endpoint/AbstractEpisodeServiceRestEndpoint.java
  523. CONFLICT (add/add): Merge conflict in modules/matterhorn-episode-service-impl/src/main/java/org/opencastproject/episode/endpoint/AbstractEpisodeServiceRestEndpoint.java
  524. Auto-merging modules/matterhorn-episode-service-impl/pom.xml
  525. CONFLICT (content): Merge conflict in modules/matterhorn-episode-service-impl/pom.xml
  526. Auto-merging modules/matterhorn-episode-service-filesystem/src/test/resources/dublincore.xml
  527. CONFLICT (add/add): Merge conflict in modules/matterhorn-episode-service-filesystem/src/test/resources/dublincore.xml
  528. Auto-merging modules/matterhorn-episode-service-filesystem/src/test/java/org/opencastproject/episode/filesystem/FileSystemElementStoreTest.java
  529. CONFLICT (add/add): Merge conflict in modules/matterhorn-episode-service-filesystem/src/test/java/org/opencastproject/episode/filesystem/FileSystemElementStoreTest.java
  530. Auto-merging modules/matterhorn-episode-service-filesystem/src/main/java/org/opencastproject/episode/filesystem/FileSystemElementStore.java
  531. CONFLICT (add/add): Merge conflict in modules/matterhorn-episode-service-filesystem/src/main/java/org/opencastproject/episode/filesystem/FileSystemElementStore.java
  532. Auto-merging modules/matterhorn-episode-service-filesystem/pom.xml
  533. CONFLICT (content): Merge conflict in modules/matterhorn-episode-service-filesystem/pom.xml
  534. Auto-merging modules/matterhorn-episode-service-api/src/main/java/org/opencastproject/episode/api/SearchResult.java
  535. Skipped modules/matterhorn-episode-service-api/src/main/java/org/opencastproject/episode/api/JaxbSearchResultItem.java (merged same as existing)
  536. Auto-merging modules/matterhorn-episode-service-api/src/main/java/org/opencastproject/episode/api/JaxbSearchResult.java
  537. Auto-merging modules/matterhorn-episode-service-api/src/main/java/org/opencastproject/episode/api/JaxbMediaSegmentPreview.java
  538. Auto-merging modules/matterhorn-episode-service-api/src/main/java/org/opencastproject/episode/api/JaxbMediaSegment.java
  539. Auto-merging modules/matterhorn-episode-service-api/src/main/java/org/opencastproject/episode/api/HttpMediaPackageElementProvider.java
  540. CONFLICT (add/add): Merge conflict in modules/matterhorn-episode-service-api/src/main/java/org/opencastproject/episode/api/HttpMediaPackageElementProvider.java
  541. Auto-merging modules/matterhorn-episode-service-api/src/main/java/org/opencastproject/episode/api/EpisodeQuery.java
  542. CONFLICT (content): Merge conflict in modules/matterhorn-episode-service-api/src/main/java/org/opencastproject/episode/api/EpisodeQuery.java
  543. Auto-merging modules/matterhorn-engage-ui/src/main/resources/ui/watch.html
  544. CONFLICT (content): Merge conflict in modules/matterhorn-engage-ui/src/main/resources/ui/watch.html
  545. Auto-merging modules/matterhorn-engage-player/src/main/flex/org/opencast/engage/videodisplay/control/util/OpencastMediaPlayer.as
  546. CONFLICT (content): Merge conflict in modules/matterhorn-engage-player/src/main/flex/org/opencast/engage/videodisplay/control/util/OpencastMediaPlayer.as
  547. Auto-merging modules/matterhorn-engage-player/src/main/flex/org/opencast/engage/videodisplay/control/command/InitMediaPlayerCommand.as
  548. CONFLICT (content): Merge conflict in modules/matterhorn-engage-player/src/main/flex/org/opencast/engage/videodisplay/control/command/InitMediaPlayerCommand.as
  549. Auto-merging modules/matterhorn-engage-player/pom.xml
  550. Auto-merging modules/matterhorn-dublincore/src/test/resources/dublincore-list.xml
  551. CONFLICT (add/add): Merge conflict in modules/matterhorn-dublincore/src/test/resources/dublincore-list.xml
  552. Auto-merging modules/matterhorn-dublincore/src/test/java/org/opencastproject/metadata/dublincore/DublinCoreTest.java
  553. CONFLICT (content): Merge conflict in modules/matterhorn-dublincore/src/test/java/org/opencastproject/metadata/dublincore/DublinCoreTest.java
  554. Auto-merging modules/matterhorn-dublincore/src/main/java/org/opencastproject/metadata/dublincore/StaticMetadataServiceDublinCoreImpl.java
  555. Auto-merging modules/matterhorn-dublincore/src/main/java/org/opencastproject/metadata/dublincore/DublinCoreCatalogList.java
  556. CONFLICT (content): Merge conflict in modules/matterhorn-dublincore/src/main/java/org/opencastproject/metadata/dublincore/DublinCoreCatalogList.java
  557. Auto-merging modules/matterhorn-dublincore/src/main/java/org/opencastproject/metadata/dublincore/DublinCoreCatalogImpl.java
  558. Auto-merging modules/matterhorn-dublincore/src/main/java/org/opencastproject/metadata/dublincore/DublinCore.java
  559. Auto-merging modules/matterhorn-distribution-service-streaming/src/main/java/org/opencastproject/distribution/streaming/endpoint/StreamingDistributionRestService.java
  560. CONFLICT (content): Merge conflict in modules/matterhorn-distribution-service-streaming/src/main/java/org/opencastproject/distribution/streaming/endpoint/StreamingDistributionRestService.java
  561. Auto-merging modules/matterhorn-distribution-service-streaming/src/main/java/org/opencastproject/distribution/streaming/StreamingDistributionService.java
  562. CONFLICT (content): Merge conflict in modules/matterhorn-distribution-service-streaming/src/main/java/org/opencastproject/distribution/streaming/StreamingDistributionService.java
  563. Auto-merging modules/matterhorn-distribution-service-streaming-remote/src/main/java/org/opencastproject/distribution/streaming/remote/StreamingDistributionServiceRemoteImpl.java
  564. CONFLICT (content): Merge conflict in modules/matterhorn-distribution-service-streaming-remote/src/main/java/org/opencastproject/distribution/streaming/remote/StreamingDistributionServiceRemoteImpl.java
  565. Auto-merging modules/matterhorn-distribution-service-download/src/test/java/org/opencastproject/distribution/download/DownloadDistributionServiceImplTest.java
  566. CONFLICT (content): Merge conflict in modules/matterhorn-distribution-service-download/src/test/java/org/opencastproject/distribution/download/DownloadDistributionServiceImplTest.java
  567. Auto-merging modules/matterhorn-distribution-service-download/src/main/java/org/opencastproject/distribution/download/endpoint/DownloadDistributionRestService.java
  568. CONFLICT (content): Merge conflict in modules/matterhorn-distribution-service-download/src/main/java/org/opencastproject/distribution/download/endpoint/DownloadDistributionRestService.java
  569. Auto-merging modules/matterhorn-distribution-service-download/src/main/java/org/opencastproject/distribution/download/DownloadDistributionServiceImpl.java
  570. CONFLICT (content): Merge conflict in modules/matterhorn-distribution-service-download/src/main/java/org/opencastproject/distribution/download/DownloadDistributionServiceImpl.java
  571. Auto-merging modules/matterhorn-distribution-service-api/src/main/java/org/opencastproject/distribution/api/DistributionService.java
  572. Auto-merging modules/matterhorn-distribution-service-acl/src/main/java/org/opencastproject/distribution/acl/endpoint/AclDistributionRestService.java
  573. CONFLICT (content): Merge conflict in modules/matterhorn-distribution-service-acl/src/main/java/org/opencastproject/distribution/acl/endpoint/AclDistributionRestService.java
  574. Auto-merging modules/matterhorn-distribution-service-acl/src/main/java/org/opencastproject/distribution/acl/AclDistributionService.java
  575. Auto-merging modules/matterhorn-distribution-service-acl/pom.xml
  576. Auto-merging modules/matterhorn-dictionary-impl/src/main/java/org/opencastproject/dictionary/impl/Word.java
  577. Auto-merging modules/matterhorn-dictionary-impl/src/main/java/org/opencastproject/dictionary/impl/DictionaryServiceJpaImpl.java
  578. Auto-merging modules/matterhorn-dictionary-impl/src/main/java/org/opencastproject/dictionary/impl/DictionaryScanner.java
  579. CONFLICT (content): Merge conflict in modules/matterhorn-dictionary-impl/src/main/java/org/opencastproject/dictionary/impl/DictionaryScanner.java
  580. Auto-merging modules/matterhorn-db/src/main/java/org/opencastproject/db/Activator.java
  581. CONFLICT (content): Merge conflict in modules/matterhorn-db/src/main/java/org/opencastproject/db/Activator.java
  582. Auto-merging modules/matterhorn-dataloader/src/main/java/org/opencastproject/dataloader/UserAndSeriesLoader.java
  583. CONFLICT (content): Merge conflict in modules/matterhorn-dataloader/src/main/java/org/opencastproject/dataloader/UserAndSeriesLoader.java
  584. Auto-merging modules/matterhorn-confidence-monitoring-ui/pom.xml
  585. Auto-merging modules/matterhorn-conductor/src/test/java/org/opencastproject/workflow/handler/RepublishWorkflowOperationHandlerTest.java
  586. CONFLICT (add/add): Merge conflict in modules/matterhorn-conductor/src/test/java/org/opencastproject/workflow/handler/RepublishWorkflowOperationHandlerTest.java
  587. Auto-merging modules/matterhorn-conductor/src/test/java/org/opencastproject/workflow/handler/InspectWorkflowOperationHandlerTest.java
  588. Auto-merging modules/matterhorn-conductor/src/test/java/org/opencastproject/workflow/handler/DistributeWorkflowOperationHandlerTest.java
  589. CONFLICT (content): Merge conflict in modules/matterhorn-conductor/src/test/java/org/opencastproject/workflow/handler/DistributeWorkflowOperationHandlerTest.java
  590. Auto-merging modules/matterhorn-conductor/src/test/java/org/opencastproject/workflow/handler/ComposeWorkflowOperationHandlerTest.java
  591. Auto-merging modules/matterhorn-conductor/src/main/resources/ui/operation/trim/trim.js
  592. CONFLICT (add/add): Merge conflict in modules/matterhorn-conductor/src/main/resources/ui/operation/trim/trim.js
  593. Auto-merging modules/matterhorn-conductor/src/main/resources/ui/operation/trim/index.html
  594. CONFLICT (content): Merge conflict in modules/matterhorn-conductor/src/main/resources/ui/operation/trim/index.html
  595. Auto-merging modules/matterhorn-conductor/src/main/resources/ui/operation/caption/index.html
  596. CONFLICT (content): Merge conflict in modules/matterhorn-conductor/src/main/resources/ui/operation/caption/index.html
  597. Skipped modules/matterhorn-conductor/src/main/resources/OSGI-INF/operations/republish.xml (merged same as existing)
  598. Auto-merging modules/matterhorn-conductor/src/main/resources/OSGI-INF/events/series-updated.xml
  599. CONFLICT (content): Merge conflict in modules/matterhorn-conductor/src/main/resources/OSGI-INF/events/series-updated.xml
  600. Auto-merging modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/ZipWorkflowOperationHandler.java
  601. CONFLICT (content): Merge conflict in modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/ZipWorkflowOperationHandler.java
  602. Auto-merging modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/TrimWorkflowOperationHandler.java
  603. CONFLICT (content): Merge conflict in modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/TrimWorkflowOperationHandler.java
  604. Auto-merging modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/TextAnalysisWorkflowOperationHandler.java
  605. CONFLICT (content): Merge conflict in modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/TextAnalysisWorkflowOperationHandler.java
  606. Auto-merging modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/TagWorkflowOperationHandler.java
  607. CONFLICT (add/add): Merge conflict in modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/TagWorkflowOperationHandler.java
  608. Auto-merging modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/RetractYouTubeWorkflowOperationHandler.java
  609. CONFLICT (content): Merge conflict in modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/RetractYouTubeWorkflowOperationHandler.java
  610. Auto-merging modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/RetractEngageWorkflowOperationHandler.java
  611. CONFLICT (add/add): Merge conflict in modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/RetractEngageWorkflowOperationHandler.java
  612. Auto-merging modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/RepublishWorkflowOperationHandler.java
  613. CONFLICT (add/add): Merge conflict in modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/RepublishWorkflowOperationHandler.java
  614. Auto-merging modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/PublishYouTubeWorkflowOperationHandler.java
  615. CONFLICT (add/add): Merge conflict in modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/PublishYouTubeWorkflowOperationHandler.java
  616. Auto-merging modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/PublishEngageWorkflowOperationHandler.java
  617. CONFLICT (add/add): Merge conflict in modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/PublishEngageWorkflowOperationHandler.java
  618. Auto-merging modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/PrepareAVWorkflowOperationHandler.java
  619. Auto-merging modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/InspectWorkflowOperationHandler.java
  620. CONFLICT (content): Merge conflict in modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/InspectWorkflowOperationHandler.java
  621. Auto-merging modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/IngestDownloadWorkflowOperationHandler.java
  622. CONFLICT (add/add): Merge conflict in modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/IngestDownloadWorkflowOperationHandler.java
  623. Auto-merging modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/ImageWorkflowOperationHandler.java
  624. CONFLICT (content): Merge conflict in modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/ImageWorkflowOperationHandler.java
  625. Auto-merging modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/EmailWorkflowOperationHandler.java
  626. CONFLICT (add/add): Merge conflict in modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/EmailWorkflowOperationHandler.java
  627. Auto-merging modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/DistributeWorkflowOperationHandler.java
  628. CONFLICT (content): Merge conflict in modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/DistributeWorkflowOperationHandler.java
  629. Auto-merging modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/ComposeWorkflowOperationHandler.java
  630. CONFLICT (content): Merge conflict in modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/ComposeWorkflowOperationHandler.java
  631. Auto-merging modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/CleanupWorkflowOperationHandler.java
  632. CONFLICT (content): Merge conflict in modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/CleanupWorkflowOperationHandler.java
  633. Auto-merging modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/CaptionUploadWorkflowOperationHandler.java
  634. CONFLICT (content): Merge conflict in modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/CaptionUploadWorkflowOperationHandler.java
  635. Skipped modules/matterhorn-conductor/src/main/java/org/opencastproject/workflow/handler/ArchiveWorkflowOperationHandler.java (merged same as existing)
  636. Auto-merging modules/matterhorn-conductor/src/main/java/org/opencastproject/event/handler/WorkflowPermissionsUpdatedEventHandler.java
  637. CONFLICT (content): Merge conflict in modules/matterhorn-conductor/src/main/java/org/opencastproject/event/handler/WorkflowPermissionsUpdatedEventHandler.java
  638. Auto-merging modules/matterhorn-conductor/src/main/java/org/opencastproject/event/handler/SeriesUpdatedEventHandler.java
  639. CONFLICT (content): Merge conflict in modules/matterhorn-conductor/src/main/java/org/opencastproject/event/handler/SeriesUpdatedEventHandler.java
  640. Auto-merging modules/matterhorn-conductor/src/main/java/org/opencastproject/event/handler/EpisodesPermissionsUpdatedEventHandler.java
  641. CONFLICT (content): Merge conflict in modules/matterhorn-conductor/src/main/java/org/opencastproject/event/handler/EpisodesPermissionsUpdatedEventHandler.java
  642. Auto-merging modules/matterhorn-conductor/pom.xml
  643. CONFLICT (content): Merge conflict in modules/matterhorn-conductor/pom.xml
  644. Auto-merging modules/matterhorn-composer-service-remote/src/main/java/org/opencastproject/composer/remote/ComposerServiceRemoteImpl.java
  645. CONFLICT (content): Merge conflict in modules/matterhorn-composer-service-remote/src/main/java/org/opencastproject/composer/remote/ComposerServiceRemoteImpl.java
  646. Auto-merging modules/matterhorn-composer-service-remote/pom.xml
  647. Auto-merging modules/matterhorn-composer-service-api/src/main/java/org/opencastproject/composer/api/EncodingProfileImpl.java
  648. CONFLICT (content): Merge conflict in modules/matterhorn-composer-service-api/src/main/java/org/opencastproject/composer/api/EncodingProfileImpl.java
  649. Auto-merging modules/matterhorn-composer-service-api/src/main/java/org/opencastproject/composer/api/EncodingProfileBuilder.java
  650. Auto-merging modules/matterhorn-composer-service-api/src/main/java/org/opencastproject/composer/api/EncodingProfile.java
  651. Auto-merging modules/matterhorn-composer-service-api/src/main/java/org/opencastproject/composer/api/EncoderEngine.java
  652. CONFLICT (content): Merge conflict in modules/matterhorn-composer-service-api/src/main/java/org/opencastproject/composer/api/EncoderEngine.java
  653. Auto-merging modules/matterhorn-composer-gstreamer/src/main/java/org/opencastproject/composer/gstreamer/endpoint/GStreamerComposerRestService.java
  654. CONFLICT (content): Merge conflict in modules/matterhorn-composer-gstreamer/src/main/java/org/opencastproject/composer/gstreamer/endpoint/GStreamerComposerRestService.java
  655. Auto-merging modules/matterhorn-composer-ffmpeg/src/test/resources/encodingprofiles.properties
  656. Auto-merging modules/matterhorn-composer-ffmpeg/src/test/java/org/opencastproject/composer/impl/TrimmingTest.java
  657. CONFLICT (content): Merge conflict in modules/matterhorn-composer-ffmpeg/src/test/java/org/opencastproject/composer/impl/TrimmingTest.java
  658. Auto-merging modules/matterhorn-composer-ffmpeg/src/test/java/org/opencastproject/composer/impl/ImageConversionTest.java
  659. CONFLICT (content): Merge conflict in modules/matterhorn-composer-ffmpeg/src/test/java/org/opencastproject/composer/impl/ImageConversionTest.java
  660. Auto-merging modules/matterhorn-composer-ffmpeg/src/test/java/org/opencastproject/composer/impl/EmbedderEngineTest.java
  661. CONFLICT (content): Merge conflict in modules/matterhorn-composer-ffmpeg/src/test/java/org/opencastproject/composer/impl/EmbedderEngineTest.java
  662. Auto-merging modules/matterhorn-composer-ffmpeg/src/test/java/org/opencastproject/composer/impl/ComposerServiceTest.java
  663. CONFLICT (content): Merge conflict in modules/matterhorn-composer-ffmpeg/src/test/java/org/opencastproject/composer/impl/ComposerServiceTest.java
  664. Auto-merging modules/matterhorn-composer-ffmpeg/src/main/java/org/opencastproject/composer/impl/ffmpeg/FFmpegEncoderEngine.java
  665. CONFLICT (content): Merge conflict in modules/matterhorn-composer-ffmpeg/src/main/java/org/opencastproject/composer/impl/ffmpeg/FFmpegEncoderEngine.java
  666. Auto-merging modules/matterhorn-composer-ffmpeg/src/main/java/org/opencastproject/composer/impl/episode/EpisodeEncoderEngine.java
  667. CONFLICT (content): Merge conflict in modules/matterhorn-composer-ffmpeg/src/main/java/org/opencastproject/composer/impl/episode/EpisodeEncoderEngine.java
  668. Auto-merging modules/matterhorn-composer-ffmpeg/src/main/java/org/opencastproject/composer/impl/endpoint/ComposerRestService.java
  669. CONFLICT (content): Merge conflict in modules/matterhorn-composer-ffmpeg/src/main/java/org/opencastproject/composer/impl/endpoint/ComposerRestService.java
  670. Auto-merging modules/matterhorn-composer-ffmpeg/src/main/java/org/opencastproject/composer/impl/EncodingProfileScanner.java
  671. CONFLICT (content): Merge conflict in modules/matterhorn-composer-ffmpeg/src/main/java/org/opencastproject/composer/impl/EncodingProfileScanner.java
  672. Auto-merging modules/matterhorn-composer-ffmpeg/src/main/java/org/opencastproject/composer/impl/ComposerServiceImpl.java
  673. CONFLICT (content): Merge conflict in modules/matterhorn-composer-ffmpeg/src/main/java/org/opencastproject/composer/impl/ComposerServiceImpl.java
  674. Auto-merging modules/matterhorn-composer-ffmpeg/src/main/java/org/opencastproject/composer/impl/AbstractCmdlineEncoderEngine.java
  675. CONFLICT (content): Merge conflict in modules/matterhorn-composer-ffmpeg/src/main/java/org/opencastproject/composer/impl/AbstractCmdlineEncoderEngine.java
  676. Auto-merging modules/matterhorn-common/src/test/java/org/opencastproject/util/data/functions/OptionsTest.java
  677. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/test/java/org/opencastproject/util/data/functions/OptionsTest.java
  678. Auto-merging modules/matterhorn-common/src/test/java/org/opencastproject/util/data/MonadicsTest.java
  679. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/test/java/org/opencastproject/util/data/MonadicsTest.java
  680. Auto-merging modules/matterhorn-common/src/test/java/org/opencastproject/util/data/FunctionsTest.java
  681. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/test/java/org/opencastproject/util/data/FunctionsTest.java
  682. Auto-merging modules/matterhorn-common/src/test/java/org/opencastproject/util/data/CollectionsTest.java
  683. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/test/java/org/opencastproject/util/data/CollectionsTest.java
  684. Auto-merging modules/matterhorn-common/src/test/java/org/opencastproject/util/IoSupportTest.java
  685. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/test/java/org/opencastproject/util/IoSupportTest.java
  686. Auto-merging modules/matterhorn-common/src/test/java/org/opencastproject/util/FileSupportTest.java
  687. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/test/java/org/opencastproject/util/FileSupportTest.java
  688. Auto-merging modules/matterhorn-common/src/test/java/org/opencastproject/util/EqualUtilTest.java
  689. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/test/java/org/opencastproject/util/EqualUtilTest.java
  690. Auto-merging modules/matterhorn-common/src/test/java/org/opencastproject/security/api/OrganizationParsingTest.java
  691. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/test/java/org/opencastproject/security/api/OrganizationParsingTest.java
  692. Auto-merging modules/matterhorn-common/src/test/java/org/opencastproject/mediapackage/track/TrackTest.java
  693. Auto-merging modules/matterhorn-common/src/test/java/org/opencastproject/mediapackage/MediaPackageTest.java
  694. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/test/java/org/opencastproject/mediapackage/MediaPackageTest.java
  695. Auto-merging modules/matterhorn-common/src/test/java/org/opencastproject/mediapackage/MediaPackageJaxbSerializationTest.java
  696. Auto-merging modules/matterhorn-common/src/test/java/org/opencastproject/mediapackage/MediaPackageBuilderTest.java
  697. Auto-merging modules/matterhorn-common/src/test/java/org/opencastproject/mediapackage/AbstractMediaPackageTest.java
  698. Skipped modules/matterhorn-common/src/main/resources/ui/restdocs/template.xhtml (merged same as existing)
  699. Auto-merging modules/matterhorn-common/src/main/resources/org/opencastproject/security/api/jaxb.index
  700. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/resources/org/opencastproject/security/api/jaxb.index
  701. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/persistence/PersistenceUtil.java
  702. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/persistence/PersistenceUtil.java
  703. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/persistence/PersistenceEnv2.java
  704. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/persistence/PersistenceEnv2.java
  705. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/persistence/PersistenceEnv.java
  706. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/persistence/PersistenceEnv.java
  707. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/osgi/SimpleServicePublisher.java
  708. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/osgi/SimpleServicePublisher.java
  709. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/doc/DocUtil.java
  710. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/data/functions/Strings.java
  711. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/data/functions/Strings.java
  712. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/data/functions/Options.java
  713. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/data/functions/Options.java
  714. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/data/functions/Misc.java
  715. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/data/functions/Misc.java
  716. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/data/functions/Functions.java
  717. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/data/functions/Functions.java
  718. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/data/functions/Eithers.java
  719. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/data/functions/Eithers.java
  720. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/data/functions/Booleans.java
  721. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/data/functions/Booleans.java
  722. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/data/VCell.java
  723. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/data/VCell.java
  724. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/data/Tuple.java
  725. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/data/Tuple.java
  726. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/data/Prelude.java
  727. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/data/Prelude.java
  728. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/data/Option.java
  729. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/data/Option.java
  730. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/data/NonEmptyList.java
  731. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/data/MultiMap.java
  732. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/data/MultiMap.java
  733. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/data/Monadics.java
  734. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/data/Monadics.java
  735. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/data/Function2.java
  736. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/data/Function2.java
  737. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/data/Function.java
  738. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/data/Function.java
  739. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/data/Either.java
  740. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/data/Either.java
  741. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/data/Effect.java
  742. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/data/Effect.java
  743. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/data/Collections.java
  744. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/data/Collections.java
  745. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/data/Cells.java
  746. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/data/Cells.java
  747. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/data/Arrays.java
  748. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/data/Arrays.java
  749. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/ZipUtil.java
  750. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/UrlSupport.java
  751. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/UrlSupport.java
  752. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/StreamHelper.java
  753. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/StreamHelper.java
  754. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/SolrUtils.java
  755. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/RestUtil.java
  756. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/RestUtil.java
  757. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/ReflectionUtil.java
  758. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/ReflectionUtil.java
  759. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/PropertiesResponse.java
  760. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/ProcessExecutor.java
  761. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/ProcessExecutor.java
  762. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/PathSupport.java
  763. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/OsgiUtil.java
  764. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/OsgiUtil.java
  765. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/MimeTypes.java
  766. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/MimeType.java
  767. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/MimeType.java
  768. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/JobUtil.java
  769. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/JobUtil.java
  770. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/JaxbXmlSchemaGenerator.java
  771. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/IoSupport.java
  772. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/IoSupport.java
  773. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/HttpUtil.java
  774. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/HttpUtil.java
  775. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/HashtableAdapter.java
  776. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/HashEntry.java
  777. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/FileSupport.java
  778. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/EqualsUtil.java
  779. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/util/EqualsUtil.java
  780. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/ChecksumType.java
  781. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/util/Checksum.java
  782. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/storage/StorageUsage.java
  783. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/storage/StorageUsage.java
  784. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/serviceregistry/api/ServiceRegistryInMemoryImpl.java
  785. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/serviceregistry/api/ServiceRegistryInMemoryImpl.java
  786. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/serviceregistry/api/ServiceRegistry.java
  787. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/serviceregistry/api/ServiceRegistry.java
  788. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/serviceregistry/api/ServiceRegistrationParser.java
  789. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/serviceregistry/api/ServiceRegistrationInMemoryImpl.java
  790. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/serviceregistry/api/ServiceRegistrationInMemoryImpl.java
  791. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/serviceregistry/api/ServiceRegistration.java
  792. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/serviceregistry/api/RemoteBase.java
  793. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/serviceregistry/api/RemoteBase.java
  794. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/serviceregistry/api/JaxbServiceRegistration.java
  795. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/serviceregistry/api/JaxbServiceRegistration.java
  796. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/serviceregistry/api/JaxbHostRegistration.java
  797. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/serviceregistry/api/JaxbHostRegistration.java
  798. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/serviceregistry/api/HostRegistrationParser.java
  799. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/serviceregistry/api/HostRegistrationParser.java
  800. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/security/util/StandAloneTrustedHttpClientImpl.java
  801. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/security/util/StandAloneTrustedHttpClientImpl.java
  802. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/security/util/SecurityUtil.java
  803. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/security/util/SecurityUtil.java
  804. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/security/util/SecurityContext.java
  805. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/security/util/SecurityContext.java
  806. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/security/api/SecurityService.java
  807. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/security/api/RoleProvider.java
  808. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/security/api/OrganizationList.java
  809. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/security/api/OrganizationList.java
  810. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/security/api/Organization.java
  811. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/security/api/Organization.java
  812. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/security/api/JaxbOrganizationList.java
  813. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/security/api/JaxbOrganizationList.java
  814. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/security/api/JaxbOrganization.java
  815. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/security/api/JaxbOrganization.java
  816. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/security/api/DefaultOrganization.java
  817. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/security/api/DefaultOrganization.java
  818. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/security/api/AccessControlUtil.java
  819. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/security/api/AccessControlUtil.java
  820. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/security/api/AccessControlParser.java
  821. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/security/api/AccessControlList.java
  822. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/security/api/AccessControlList.java
  823. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/security/api/AccessControlEntry.java
  824. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/security/api/AccessControlEntry.java
  825. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/rest/AbstractJobProducerEndpoint.java
  826. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/rest/AbstractJobProducerEndpoint.java
  827. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/mediapackage/track/TrackImpl.java
  828. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/mediapackage/selector/AbstractMediaPackageElementSelector.java
  829. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/mediapackage/selector/AbstractMediaPackageElementSelector.java
  830. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/mediapackage/elementbuilder/PublicationBuilderPlugin.java
  831. CONFLICT (add/add): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/mediapackage/elementbuilder/PublicationBuilderPlugin.java
  832. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/mediapackage/elementbuilder/AbstractElementBuilderPlugin.java
  833. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/mediapackage/attachment/AttachmentImpl.java
  834. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/mediapackage/Track.java
  835. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/mediapackage/Track.java
  836. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/mediapackage/MediaPackageSupport.java
  837. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/mediapackage/MediaPackageSupport.java
  838. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/mediapackage/MediaPackageParser.java
  839. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/mediapackage/MediaPackageParser.java
  840. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/mediapackage/MediaPackageImpl.java
  841. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/mediapackage/MediaPackageImpl.java
  842. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/mediapackage/MediaPackageElements.java
  843. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/mediapackage/MediaPackageElements.java
  844. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/mediapackage/MediaPackageElementParser.java
  845. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/mediapackage/MediaPackageElement.java
  846. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/mediapackage/MediaPackageBuilderImpl.java
  847. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/mediapackage/MediaPackage.java
  848. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/mediapackage/MediaPackage.java
  849. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/mediapackage/AbstractMediaPackageElement.java
  850. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/job/api/JobParser.java
  851. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/job/api/JobBarrier.java
  852. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/job/api/JobBarrier.java
  853. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/job/api/Job.java
  854. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/job/api/Job.java
  855. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/job/api/JaxbJob.java
  856. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/job/api/AbstractJobProducer.java
  857. CONFLICT (content): Merge conflict in modules/matterhorn-common/src/main/java/org/opencastproject/job/api/AbstractJobProducer.java
  858. Auto-merging modules/matterhorn-common/src/main/java/org/opencastproject/capture/CaptureParameters.java
  859. Auto-merging modules/matterhorn-common/pom.xml
  860. CONFLICT (content): Merge conflict in modules/matterhorn-common/pom.xml
  861. Auto-merging modules/matterhorn-capture-agent-impl/src/test/java/org/opencastproject/capture/pipeline/bins/consumers/VideoFilesinkConsumerTest.java
  862. CONFLICT (content): Merge conflict in modules/matterhorn-capture-agent-impl/src/test/java/org/opencastproject/capture/pipeline/bins/consumers/VideoFilesinkConsumerTest.java
  863. Auto-merging modules/matterhorn-capture-agent-impl/src/test/java/org/opencastproject/capture/pipeline/bins/consumers/ConsumerFactoryTest.java
  864. Auto-merging modules/matterhorn-capture-agent-impl/src/test/java/org/opencastproject/capture/pipeline/bins/CaptureDeviceBinTest.java
  865. Removing modules/matterhorn-capture-agent-impl/src/test/java/org/opencastproject/capture/impl/GStreamerCaptureTest.java
  866. Auto-merging modules/matterhorn-capture-agent-impl/src/test/java/org/opencastproject/capture/impl/ConfigurationManagerTest.java
  867. Removing modules/matterhorn-capture-agent-impl/src/main/resources/OSGI-INF/gstreamer-capture-framework.xml
  868. Removing modules/matterhorn-capture-agent-impl/src/main/resources/OSGI-INF/confidence-monitor-service.xml
  869. Auto-merging modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/pipeline/bins/producers/V4LProducer.java
  870. CONFLICT (content): Merge conflict in modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/pipeline/bins/producers/V4LProducer.java
  871. Auto-merging modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/pipeline/bins/producers/ProducerFactory.java
  872. Auto-merging modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/pipeline/bins/consumers/VideoMonitoringConsumer.java
  873. CONFLICT (content): Merge conflict in modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/pipeline/bins/consumers/VideoMonitoringConsumer.java
  874. Auto-merging modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/pipeline/bins/consumers/VideoFilesinkConsumer.java
  875. CONFLICT (content): Merge conflict in modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/pipeline/bins/consumers/VideoFilesinkConsumer.java
  876. Auto-merging modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/pipeline/GStreamerPipeline.java
  877. CONFLICT (content): Merge conflict in modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/pipeline/GStreamerPipeline.java
  878. Removing modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/impl/monitoring/MonitoringEntry.java
  879. Auto-merging modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/impl/jobs/AgentStateJob.java
  880. CONFLICT (content): Merge conflict in modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/impl/jobs/AgentStateJob.java
  881. Auto-merging modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/impl/SchedulerImpl.java
  882. CONFLICT (content): Merge conflict in modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/impl/SchedulerImpl.java
  883. Removing modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/impl/GStreamerCaptureFramework.java
  884. Auto-merging modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/impl/ConfigurationManager.java
  885. CONFLICT (content): Merge conflict in modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/impl/ConfigurationManager.java
  886. Removing modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/impl/CaptureFramework.java
  887. Auto-merging modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/impl/CaptureAgentImpl.java
  888. CONFLICT (content): Merge conflict in modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/impl/CaptureAgentImpl.java
  889. Auto-merging modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/endpoint/StateRestService.java
  890. CONFLICT (content): Merge conflict in modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/endpoint/StateRestService.java
  891. Auto-merging modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/endpoint/ScheduledEventList.java
  892. Auto-merging modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/endpoint/ConfidenceMonitorRestService.java
  893. Auto-merging modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/endpoint/CaptureRestService.java
  894. Auto-merging modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/endpoint/AgentDevice.java
  895. Auto-merging modules/matterhorn-capture-admin-service-impl/src/test/java/org/opencastproject/capture/admin/impl/CaptureAgentStateServiceImplTest.java
  896. CONFLICT (content): Merge conflict in modules/matterhorn-capture-admin-service-impl/src/test/java/org/opencastproject/capture/admin/impl/CaptureAgentStateServiceImplTest.java
  897. Auto-merging modules/matterhorn-capture-admin-service-impl/src/main/java/org/opencastproject/capture/admin/impl/CaptureAgentStateServiceImpl.java
  898. CONFLICT (content): Merge conflict in modules/matterhorn-capture-admin-service-impl/src/main/java/org/opencastproject/capture/admin/impl/CaptureAgentStateServiceImpl.java
  899. Auto-merging modules/matterhorn-capture-admin-service-impl/src/main/java/org/opencastproject/capture/admin/impl/AgentImpl.java
  900. Auto-merging modules/matterhorn-capture-admin-service-impl/src/main/java/org/opencastproject/capture/admin/endpoint/CaptureAgentStateRestService.java
  901. CONFLICT (content): Merge conflict in modules/matterhorn-capture-admin-service-impl/src/main/java/org/opencastproject/capture/admin/endpoint/CaptureAgentStateRestService.java
  902. Auto-merging modules/matterhorn-capture-admin-service-impl/src/main/java/org/opencastproject/capture/admin/endpoint/AgentStateUpdateList.java
  903. Auto-merging modules/matterhorn-caption-remote/pom.xml
  904. CONFLICT (add/add): Merge conflict in modules/matterhorn-caption-remote/pom.xml
  905. Auto-merging modules/matterhorn-caption-impl/src/main/java/org/opencastproject/caption/impl/CaptionServiceImpl.java
  906. Auto-merging modules/matterhorn-caption-impl/src/main/java/org/opencastproject/caption/endpoint/CaptionServiceRestEndpoint.java
  907. CONFLICT (content): Merge conflict in modules/matterhorn-caption-impl/src/main/java/org/opencastproject/caption/endpoint/CaptionServiceRestEndpoint.java
  908. Auto-merging modules/matterhorn-authorization-xacml/src/test/java/org/opencastproject/authorization/xacml/XacmlSecurityTest.java
  909. CONFLICT (content): Merge conflict in modules/matterhorn-authorization-xacml/src/test/java/org/opencastproject/authorization/xacml/XacmlSecurityTest.java
  910. Auto-merging modules/matterhorn-authorization-xacml/src/main/java/org/opencastproject/authorization/xacml/XACMLAuthorizationService.java
  911. CONFLICT (content): Merge conflict in modules/matterhorn-authorization-xacml/src/main/java/org/opencastproject/authorization/xacml/XACMLAuthorizationService.java
  912. Auto-merging modules/matterhorn-authorization-xacml/pom.xml
  913. Auto-merging modules/matterhorn-annotation-impl/src/test/java/org/opencastproject/annotation/impl/AnnotationServiceJpaImplTest.java
  914. CONFLICT (content): Merge conflict in modules/matterhorn-annotation-impl/src/test/java/org/opencastproject/annotation/impl/AnnotationServiceJpaImplTest.java
  915. Auto-merging modules/matterhorn-annotation-impl/src/main/java/org/opencastproject/annotation/impl/AnnotationServiceJpaImpl.java
  916. CONFLICT (content): Merge conflict in modules/matterhorn-annotation-impl/src/main/java/org/opencastproject/annotation/impl/AnnotationServiceJpaImpl.java
  917. Auto-merging modules/matterhorn-annotation-impl/src/main/java/org/opencastproject/annotation/impl/AnnotationRestService.java
  918. CONFLICT (content): Merge conflict in modules/matterhorn-annotation-impl/src/main/java/org/opencastproject/annotation/impl/AnnotationRestService.java
  919. Auto-merging modules/matterhorn-annotation-impl/src/main/java/org/opencastproject/annotation/impl/AnnotationImpl.java
  920. CONFLICT (content): Merge conflict in modules/matterhorn-annotation-impl/src/main/java/org/opencastproject/annotation/impl/AnnotationImpl.java
  921. Auto-merging modules/matterhorn-annotation-api/src/main/java/org/opencastproject/annotation/api/AnnotationService.java
  922. CONFLICT (content): Merge conflict in modules/matterhorn-annotation-api/src/main/java/org/opencastproject/annotation/api/AnnotationService.java
  923. Auto-merging modules/matterhorn-analytics-ui/pom.xml
  924. CONFLICT (add/add): Merge conflict in modules/matterhorn-analytics-ui/pom.xml
  925. Auto-merging modules/matterhorn-admin-ui/src/main/resources/ui/templates/viewinfo-inspect.tpl
  926. CONFLICT (content): Merge conflict in modules/matterhorn-admin-ui/src/main/resources/ui/templates/viewinfo-inspect.tpl
  927. Auto-merging modules/matterhorn-admin-ui/src/main/resources/ui/templates/viewinfo-info.tpl
  928. Auto-merging modules/matterhorn-admin-ui/src/main/resources/ui/templates/statistics-table-servers.tpl
  929. Auto-merging modules/matterhorn-admin-ui/src/main/resources/ui/templates/series_list-header.tpl
  930. Auto-merging modules/matterhorn-admin-ui/src/main/resources/ui/templates/series.tpl
  931. Auto-merging modules/matterhorn-admin-ui/src/main/resources/ui/templates/scheduler.tpl
  932. CONFLICT (content): Merge conflict in modules/matterhorn-admin-ui/src/main/resources/ui/templates/scheduler.tpl
  933. Auto-merging modules/matterhorn-admin-ui/src/main/resources/ui/templates/recordings-table.tpl
  934. Auto-merging modules/matterhorn-admin-ui/src/main/resources/ui/templates/episodes-table.tpl
  935. CONFLICT (content): Merge conflict in modules/matterhorn-admin-ui/src/main/resources/ui/templates/episodes-table.tpl
  936. Auto-merging modules/matterhorn-admin-ui/src/main/resources/ui/templates/episodes-header.tpl
  937. Auto-merging modules/matterhorn-admin-ui/src/main/resources/ui/templates/episode-detail-mediapackage.tpl
  938. CONFLICT (content): Merge conflict in modules/matterhorn-admin-ui/src/main/resources/ui/templates/episode-detail-mediapackage.tpl
  939. Auto-merging modules/matterhorn-admin-ui/src/main/resources/ui/templates/capture_agents-table.tpl
  940. CONFLICT (content): Merge conflict in modules/matterhorn-admin-ui/src/main/resources/ui/templates/capture_agents-table.tpl
  941. Auto-merging modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.view.series.js
  942. Auto-merging modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.utils.js
  943. Auto-merging modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.users.js
  944. Auto-merging modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.upload.new.js
  945. CONFLICT (content): Merge conflict in modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.upload.new.js
  946. Auto-merging modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.statistics.js
  947. CONFLICT (content): Merge conflict in modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.statistics.js
  948. Auto-merging modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.series.list.js
  949. Auto-merging modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.series.js
  950. CONFLICT (content): Merge conflict in modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.series.js
  951. Auto-merging modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.scheduler.js
  952. CONFLICT (content): Merge conflict in modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.scheduler.js
  953. Auto-merging modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.recordings.js
  954. CONFLICT (content): Merge conflict in modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.recordings.js
  955. Auto-merging modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.metrics.js
  956. CONFLICT (add/add): Merge conflict in modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.metrics.js
  957. Auto-merging modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.inspect.js
  958. Auto-merging modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.episode.js
  959. Auto-merging modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.capture.agent.js
  960. CONFLICT (content): Merge conflict in modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.capture.agent.js
  961. Auto-merging modules/matterhorn-admin-ui/src/main/resources/ui/index.html
  962. CONFLICT (content): Merge conflict in modules/matterhorn-admin-ui/src/main/resources/ui/index.html
  963. Auto-merging modules/matterhorn-admin-ui/src/main/resources/ui/i18n/scheduler.properties
  964. CONFLICT (content): Merge conflict in modules/matterhorn-admin-ui/src/main/resources/ui/i18n/scheduler.properties
  965. Auto-merging modules/matterhorn-admin-ui/src/main/resources/ui/css/admin.css
  966. CONFLICT (content): Merge conflict in modules/matterhorn-admin-ui/src/main/resources/ui/css/admin.css
  967. Auto-merging modules/matterhorn-admin-ui/pom.xml
  968. Auto-merging etc/workflows/retract.xml
  969. CONFLICT (add/add): Merge conflict in etc/workflows/retract.xml
  970. Auto-merging etc/workflows/republish.xml
  971. CONFLICT (add/add): Merge conflict in etc/workflows/republish.xml
  972. Auto-merging etc/workflows/email-error-handler.xml
  973. CONFLICT (add/add): Merge conflict in etc/workflows/email-error-handler.xml
  974. Skipped etc/workflows/default.xml (merged same as existing)
  975. Auto-merging etc/workflows/default-error-handler.xml
  976. CONFLICT (content): Merge conflict in etc/workflows/default-error-handler.xml
  977. Auto-merging etc/system.properties
  978. CONFLICT (add/add): Merge conflict in etc/system.properties
  979. Skipped etc/services/org.ops4j.pax.logging.properties (merged same as existing)
  980. Skipped etc/services/org.opencastproject.workflow.impl.WorkflowServiceImpl.properties (merged same as existing)
  981. Auto-merging etc/services/org.opencastproject.usertracking.impl.UserTrackingServiceImpl.properties
  982. Auto-merging etc/services/org.opencastproject.serviceregistry.impl.ServiceRegistryJpaImpl.properties
  983. Skipped etc/services/org.opencastproject.oaipmh.server.OaiPmhRepositoryServlet.properties (merged same as existing)
  984. Skipped etc/services/org.opencastproject.oaipmh.harvester.OaiPmhHarvester.properties (merged same as existing)
  985. Skipped etc/services/org.opencastproject.loadtest.impl.LoadTestFactory.properties (merged same as existing)
  986. Auto-merging etc/services/org.opencastproject.fileupload.service.FileUploadServiceImpl.properties
  987. CONFLICT (add/add): Merge conflict in etc/services/org.opencastproject.fileupload.service.FileUploadServiceImpl.properties
  988. Skipped etc/services/org.opencastproject.capture.impl.SchedulerImpl.properties (merged same as existing)
  989. Skipped etc/services/org.opencastproject.capture.impl.ConfigurationManager.properties (merged same as existing)
  990. Skipped etc/services/org.opencastproject.capture.impl.CaptureAgentImpl.properties (merged same as existing)
  991. Skipped etc/services/org.opencastproject.analysis.vsegmenter.VideoSegmenter.properties (merged same as existing)
  992. Skipped etc/services/java.util.logging.properties (merged same as existing)
  993. Auto-merging etc/security/security_sample_cas_xml
  994. CONFLICT (content): Merge conflict in etc/security/security_sample_cas_xml
  995. Auto-merging etc/security/mh_default_org.xml
  996. CONFLICT (content): Merge conflict in etc/security/mh_default_org.xml
  997. Skipped etc/motd (merged same as existing)
  998. Auto-merging etc/load/org.opencastproject.organization-mh_default_org.cfg
  999. CONFLICT (add/add): Merge conflict in etc/load/org.opencastproject.organization-mh_default_org.cfg
  1000. Auto-merging etc/load/org.opencastproject.ingest.scanner.InboxScannerService-inbox.cfg
  1001. Auto-merging etc/load/org.apache.felix.fileinstall-workflows.cfg
  1002. CONFLICT (add/add): Merge conflict in etc/load/org.apache.felix.fileinstall-workflows.cfg
  1003. Auto-merging etc/load/org.apache.felix.fileinstall-security.cfg
  1004. CONFLICT (add/add): Merge conflict in etc/load/org.apache.felix.fileinstall-security.cfg
  1005. Auto-merging etc/load/org.apache.felix.fileinstall-feeds.cfg
  1006. CONFLICT (add/add): Merge conflict in etc/load/org.apache.felix.fileinstall-feeds.cfg
  1007. Auto-merging etc/load/org.apache.felix.fileinstall-encoding.cfg
  1008. CONFLICT (add/add): Merge conflict in etc/load/org.apache.felix.fileinstall-encoding.cfg
  1009. Auto-merging etc/load/org.apache.felix.fileinstall-dictionary.cfg
  1010. CONFLICT (add/add): Merge conflict in etc/load/org.apache.felix.fileinstall-dictionary.cfg
  1011. Skipped etc/gsencoding/other-movies.properties (merged same as existing)
  1012. Skipped etc/gsencoding/matterhorn-movies.properties (merged same as existing)
  1013. Skipped etc/gsencoding/matterhorn-images.properties (merged same as existing)
  1014. Skipped etc/gsencoding/feed-movies.properties (merged same as existing)
  1015. Skipped etc/gsencoding/feed-images.properties (merged same as existing)
  1016. Skipped etc/gsencoding/engage-movies.properties (merged same as existing)
  1017. Skipped etc/gsencoding/engage-images.properties (merged same as existing)
  1018. Skipped etc/gosh_profile (merged same as existing)
  1019. Skipped etc/feeds/teaching_education_video.properties (merged same as existing)
  1020. Skipped etc/feeds/teaching_education_audio.properties (merged same as existing)
  1021. Skipped etc/feeds/subject_video.properties (merged same as existing)
  1022. Skipped etc/feeds/subject_audio.properties (merged same as existing)
  1023. Skipped etc/feeds/society_video.properties (merged same as existing)
  1024. Skipped etc/feeds/society_audio.properties (merged same as existing)
  1025. Skipped etc/feeds/social_science_video.properties (merged same as existing)
  1026. Skipped etc/feeds/social_science_audio.properties (merged same as existing)
  1027. Skipped etc/feeds/series_audio.properties (merged same as existing)
  1028. Skipped etc/feeds/series.properties (merged same as existing)
  1029. Skipped etc/feeds/search.properties (merged same as existing)
  1030. Skipped etc/feeds/science_video.properties (merged same as existing)
  1031. Skipped etc/feeds/science_audio.properties (merged same as existing)
  1032. Skipped etc/feeds/literature_video.properties (merged same as existing)
  1033. Skipped etc/feeds/literature_audio.properties (merged same as existing)
  1034. Skipped etc/feeds/latest.properties (merged same as existing)
  1035. Skipped etc/feeds/language_video.properties (merged same as existing)
  1036. Skipped etc/feeds/language_audio.properties (merged same as existing)
  1037. Skipped etc/feeds/humanities_video.properties (merged same as existing)
  1038. Skipped etc/feeds/humanities_audio.properties (merged same as existing)
  1039. Skipped etc/feeds/history_video.properties (merged same as existing)
  1040. Skipped etc/feeds/history_audio.properties (merged same as existing)
  1041. Skipped etc/feeds/health_medicine_video.properties (merged same as existing)
  1042. Skipped etc/feeds/health_medicine_audio.properties (merged same as existing)
  1043. Skipped etc/feeds/fine_arts_video.properties (merged same as existing)
  1044. Skipped etc/feeds/fine_arts_audio.properties (merged same as existing)
  1045. Skipped etc/feeds/engineering_video.properties (merged same as existing)
  1046. Skipped etc/feeds/engineering_audio.properties (merged same as existing)
  1047. Skipped etc/feeds/custom.properties (merged same as existing)
  1048. Skipped etc/feeds/business_video.properties (merged same as existing)
  1049. Skipped etc/feeds/business_audio.properties (merged same as existing)
  1050. Skipped etc/feeds/aggregation.properties (merged same as existing)
  1051. Skipped etc/factories/org.opencastproject.userdirectory.ldap.properties (merged same as existing)
  1052. Auto-merging etc/encoding/matterhorn-images.properties
  1053. CONFLICT (content): Merge conflict in etc/encoding/matterhorn-images.properties
  1054. Auto-merging etc/encoding/matterhorn-branding.properties
  1055. Auto-merging etc/encoding/feed-movies.properties
  1056. Auto-merging etc/encoding/feed-images.properties
  1057. CONFLICT (content): Merge conflict in etc/encoding/feed-images.properties
  1058. Auto-merging etc/encoding/engage-movies.properties
  1059. CONFLICT (content): Merge conflict in etc/encoding/engage-movies.properties
  1060. Auto-merging etc/encoding/engage-movies-multi-quality.properties
  1061. Auto-merging etc/encoding/engage-images.properties
  1062. CONFLICT (content): Merge conflict in etc/encoding/engage-images.properties
  1063. Skipped etc/dictionaries/es.csv (merged same as existing)
  1064. CONFLICT (rename/rename): Rename "docs/felix/conf/config.properties"->"etc/config.properties" in branch "Temporary merge branch 1" rename "docs/felix/conf/config.properties"->"modules/matterhorn-manager-impl/src/test/resources/configs/moreConfigs/config.properties" in "Temporary merge branch 2" (left unresolved)
  1065. Skipped etc/branding/watermark.png (merged same as existing)
  1066. Removing docs/subversion.config
  1067. Auto-merging docs/scripts/ubuntu_vm/buildvm.sh
  1068. CONFLICT (content): Merge conflict in docs/scripts/ubuntu_vm/buildvm.sh
  1069. Auto-merging docs/scripts/ubuntu_capture_agent/setup_source.sh
  1070. CONFLICT (content): Merge conflict in docs/scripts/ubuntu_capture_agent/setup_source.sh
  1071. Auto-merging docs/scripts/ubuntu_capture_agent/setup_environment.sh
  1072. CONFLICT (content): Merge conflict in docs/scripts/ubuntu_capture_agent/setup_environment.sh
  1073. Auto-merging docs/scripts/ubuntu_capture_agent/setup_boot.sh
  1074. CONFLICT (content): Merge conflict in docs/scripts/ubuntu_capture_agent/setup_boot.sh
  1075. Auto-merging docs/scripts/ubuntu_capture_agent/install.sh
  1076. CONFLICT (content): Merge conflict in docs/scripts/ubuntu_capture_agent/install.sh
  1077. Auto-merging docs/scripts/ubuntu_capture_agent/default.packages
  1078. CONFLICT (content): Merge conflict in docs/scripts/ubuntu_capture_agent/default.packages
  1079. Auto-merging docs/scripts/ubuntu_capture_agent/Ubuntu-12-10.packages
  1080. CONFLICT (add/add): Merge conflict in docs/scripts/ubuntu_capture_agent/Ubuntu-12-10.packages
  1081. Auto-merging docs/scripts/ubuntu_capture_agent/Ubuntu-12-04.packages
  1082. CONFLICT (add/add): Merge conflict in docs/scripts/ubuntu_capture_agent/Ubuntu-12-04.packages
  1083. Auto-merging docs/scripts/release/tag.sh
  1084. CONFLICT (add/add): Merge conflict in docs/scripts/release/tag.sh
  1085. Removing docs/scripts/release/release_team.ipy
  1086. Auto-merging docs/scripts/release/branch.sh
  1087. CONFLICT (content): Merge conflict in docs/scripts/release/branch.sh
  1088. CONFLICT (rename/rename): Rename "docs/felix/bin/matterhorn_init_d.sh"->"docs/scripts/init/matterhorn_init_d.sh" in branch "Temporary merge branch 1" rename "docs/felix/bin/matterhorn_init_d.sh"->"docs/scripts/init/old/etc-init.d-matterhorn" in "Temporary merge branch 2" (left unresolved)
  1089. Removing docs/scripts/ec2-ami-setup/set-runtime-config.sh
  1090. Auto-merging docs/scripts/ddl/mysql5.sql
  1091. CONFLICT (content): Merge conflict in docs/scripts/ddl/mysql5.sql
  1092. Removing docs/scripts/binary_dist.sh
  1093. Auto-merging docs/scripts/3rd_party/utilx
  1094. Auto-merging docs/scripts/3rd_party/tesseract/mac-compile
  1095. CONFLICT (content): Merge conflict in docs/scripts/3rd_party/tesseract/mac-compile
  1096. Auto-merging docs/scripts/3rd_party/tesseract/linux-compile
  1097. CONFLICT (content): Merge conflict in docs/scripts/3rd_party/tesseract/linux-compile
  1098. Auto-merging docs/scripts/3rd_party/tesseract/config.txt
  1099. CONFLICT (content): Merge conflict in docs/scripts/3rd_party/tesseract/config.txt
  1100. Auto-merging docs/scripts/3rd_party/sox_libs/mad/mac-compile
  1101. Auto-merging docs/scripts/3rd_party/sox_libs/mad/linux-compile
  1102. Auto-merging docs/scripts/3rd_party/sox_libs/id3tag/mac-compile
  1103. Auto-merging docs/scripts/3rd_party/sox_libs/id3tag/linux-compile
  1104. CONFLICT (content): Merge conflict in docs/scripts/3rd_party/sox_libs/id3tag/linux-compile
  1105. Auto-merging docs/scripts/3rd_party/sox_libs/flac/ports-compile
  1106. Auto-merging docs/scripts/3rd_party/sox_libs/flac/linux-compile
  1107. Auto-merging docs/scripts/3rd_party/sox/ports-compile
  1108. Auto-merging docs/scripts/3rd_party/sox/mac-compile
  1109. Removing docs/scripts/3rd_party/ocropus_libs/win32-compile
  1110. Removing docs/scripts/3rd_party/ocropus_libs/sdl_image/win32-compile
  1111. Removing docs/scripts/3rd_party/ocropus_libs/sdl_image/config.txt
  1112. Removing docs/scripts/3rd_party/ocropus_libs/sdl_gfx/win32-compile
  1113. Removing docs/scripts/3rd_party/ocropus_libs/sdl_gfx/config.txt
  1114. Removing docs/scripts/3rd_party/ocropus_libs/sdl_gfx/Makefile.mingw
  1115. Removing docs/scripts/3rd_party/ocropus_libs/sdl_gfx/Makefile.in
  1116. Removing docs/scripts/3rd_party/ocropus_libs/regex/win32-compile
  1117. Removing docs/scripts/3rd_party/ocropus_libs/regex/config.txt
  1118. Removing docs/scripts/3rd_party/ocropus_libs/regex/Makefile.in
  1119. Removing docs/scripts/3rd_party/ocropus_libs/regex/Makefile.am
  1120. Removing docs/scripts/3rd_party/ocropus_libs/ports-compile
  1121. Removing docs/scripts/3rd_party/ocropus_libs/mac-compile
  1122. Removing docs/scripts/3rd_party/ocropus_libs/linux-compile
  1123. Removing docs/scripts/3rd_party/ocropus_libs/iulib/win32-compile
  1124. Removing docs/scripts/3rd_party/ocropus_libs/iulib/test-pbmpng.cc
  1125. Removing docs/scripts/3rd_party/ocropus_libs/iulib/quicksort.h
  1126. Removing docs/scripts/3rd_party/ocropus_libs/iulib/narray.h
  1127. Removing docs/scripts/3rd_party/ocropus_libs/iulib/mac-compile
  1128. Removing docs/scripts/3rd_party/ocropus_libs/iulib/linux-compile
  1129. Removing docs/scripts/3rd_party/ocropus_libs/iulib/io_jpeg.cc
  1130. Removing docs/scripts/3rd_party/ocropus_libs/iulib/config.txt
  1131. Removing docs/scripts/3rd_party/ocropus_libs/iulib/compat.h
  1132. Removing docs/scripts/3rd_party/ocropus_libs/iulib/SConstruct.ports
  1133. Removing docs/scripts/3rd_party/ocropus_libs/iulib/SConstruct.org
  1134. Removing docs/scripts/3rd_party/ocropus_libs/iulib/SConstruct.mingw
  1135. Removing docs/scripts/3rd_party/ocropus_libs/iulib/SConstruct.mac
  1136. Removing docs/scripts/3rd_party/ocropus_libs/iulib/SConstruct.linux
  1137. Removing docs/scripts/3rd_party/ocropus_libs/gsl/win32-compile
  1138. Removing docs/scripts/3rd_party/ocropus_libs/gsl/config.txt
  1139. Removing docs/scripts/3rd_party/ocropus_libs/glob/win32-compile
  1140. Removing docs/scripts/3rd_party/ocropus_libs/glob/config.txt
  1141. Removing docs/scripts/3rd_party/ocropus_libs/fst/config.txt
  1142. Removing docs/scripts/3rd_party/ocropus_libs/download-sources
  1143. Removing docs/scripts/3rd_party/ocropus_libs/dlfcn/win32-compile
  1144. Removing docs/scripts/3rd_party/ocropus_libs/dlfcn/dlfcn.h
  1145. Removing docs/scripts/3rd_party/ocropus_libs/dlfcn/dlfcn.c
  1146. Removing docs/scripts/3rd_party/ocropus_libs/dlfcn/configure
  1147. Removing docs/scripts/3rd_party/ocropus_libs/dlfcn/config.txt
  1148. Removing docs/scripts/3rd_party/ocropus_libs/clean-up
  1149. Removing docs/scripts/3rd_party/ocropus/xml-entities.cc
  1150. Removing docs/scripts/3rd_party/ocropus/winsock2.h.org
  1151. Removing docs/scripts/3rd_party/ocropus/winsock2.h
  1152. Removing docs/scripts/3rd_party/ocropus/tesseract.cc
  1153. Removing docs/scripts/3rd_party/ocropus/sysutil.h
  1154. Removing docs/scripts/3rd_party/ocropus/sysutil.cc
  1155. Removing docs/scripts/3rd_party/ocropus/ocropus.h
  1156. Removing docs/scripts/3rd_party/ocropus/ocropus.cc
  1157. Removing docs/scripts/3rd_party/ocropus/ocrofst-io.cc
  1158. Removing docs/scripts/3rd_party/ocropus/ocrocmd-1.0-win.c
  1159. Removing docs/scripts/3rd_party/ocropus/ocrocmd-1.0-unix.c
  1160. Removing docs/scripts/3rd_party/ocropus/ocr-utils.h
  1161. Removing docs/scripts/3rd_party/ocropus/ocr-commands.cc
  1162. Removing docs/scripts/3rd_party/ocropus/mac-compile.notnow
  1163. Removing docs/scripts/3rd_party/ocropus/linux-compile.notnow
  1164. Removing docs/scripts/3rd_party/ocropus/glinerec.h
  1165. Removing docs/scripts/3rd_party/ocropus/config.txt
  1166. Removing docs/scripts/3rd_party/ocropus/components.cc
  1167. Removing docs/scripts/3rd_party/ocropus/SDL_main.patch
  1168. Removing docs/scripts/3rd_party/ocropus/SConstruct.ports
  1169. Removing docs/scripts/3rd_party/ocropus/SConstruct.org
  1170. Removing docs/scripts/3rd_party/ocropus/SConstruct.mingw
  1171. Removing docs/scripts/3rd_party/ocropus/SConstruct.mac
  1172. Removing docs/scripts/3rd_party/ocropus/SConstruct.linux
  1173. Auto-merging docs/scripts/3rd_party/ffmpeg_libs/vpx/mac-compile
  1174. Auto-merging docs/scripts/3rd_party/ffmpeg_libs/vpx/linux-compile
  1175. Auto-merging docs/scripts/3rd_party/ffmpeg_libs/sdl/mac-compile
  1176. Auto-merging docs/scripts/3rd_party/ffmpeg_libs/sdl/linux-compile
  1177. CONFLICT (content): Merge conflict in docs/scripts/3rd_party/ffmpeg_libs/sdl/linux-compile
  1178. Auto-merging docs/scripts/3rd_party/ffmpeg_libs/sdl/config.txt
  1179. CONFLICT (content): Merge conflict in docs/scripts/3rd_party/ffmpeg_libs/sdl/config.txt
  1180. Skipped docs/scripts/3rd_party/ffmpeg_libs/sdl/SDL_main-1.2.15.h (merged same as existing)
  1181. Auto-merging docs/scripts/3rd_party/ffmpeg_libs/mp4v2/mp4v2-1.9.1.patch
  1182. Auto-merging docs/scripts/3rd_party/ffmpeg/mac-compile
  1183. Auto-merging docs/scripts/3rd_party/ffmpeg/linux-compile
  1184. Auto-merging docs/scripts/3rd_party/config.txt
  1185. CONFLICT (content): Merge conflict in docs/scripts/3rd_party/config.txt
  1186. Auto-merging docs/scripts/3rd_party/check-urls
  1187. Auto-merging docs/scripts/3rd_party/check-prereq
  1188. CONFLICT (content): Merge conflict in docs/scripts/3rd_party/check-prereq
  1189. Auto-merging docs/scripts/3rd_party/base_libs/leptonica/win32-compile
  1190. Auto-merging docs/scripts/3rd_party/base_libs/leptonica/ports-compile
  1191. Auto-merging docs/scripts/3rd_party/base_libs/leptonica/mac-compile
  1192. Auto-merging docs/scripts/3rd_party/base_libs/leptonica/linux-compile
  1193. Skipped docs/scripts/3rd_party/base_libs/gif/win32-compile (merged same as existing)
  1194. Skipped docs/scripts/3rd_party/base_libs/gif/ports-compile (merged same as existing)
  1195. Auto-merging docs/scripts/3rd_party/base_libs/gif/mac-compile
  1196. Auto-merging docs/scripts/3rd_party/base_libs/gif/linux-compile
  1197. Auto-merging docs/checkstyle/matterhorn-checkstyle.xml
  1198. Removing docs/checkstyle/README.txt
  1199. Auto-merging bin/start_matterhorn.sh
  1200. CONFLICT (content): Merge conflict in bin/start_matterhorn.sh
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!