Today, Josh and I merged tag 10063 (1st release candidate) from the 1.1.x 
release branch back to trunk. Unit and integration tests are passing but we are 
asking developers to take a quick look at relevant parts of their code to make 
sure we didn't break anything.

We encountered a few merge conflicts where people had (initially) committed to 
both branch 1.1.x and trunk. In addition, there were two new methods on trunk 
in SchedulerImpl (isLocked() and setLocked()).

We'll be doing the merge again for each subsequent release candidate, so please 
*don't* commit in both places. Fixes go to the 1.1.x branch while new features 
go to trunk.

Thanks,
Josh & Tobias
_______________________________________________
Matterhorn mailing list
[email protected]
http://lists.opencastproject.org/mailman/listinfo/matterhorn


To unsubscribe please email
[email protected]
_______________________________________________

Reply via email to