[Building Sakai] 2.6.x build is broken

[Steve Swinsburg]

Hi all,

The 2.6.x build is broken:

[ERROR] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Compilation failure
/Users/steve/dev/sakai/src/2.6.x/sam/samigo-services/src/java/org/sakaiproject/tool/assessment/facade/PublishedAssessmentFacadeQueries.java:[119,7] org.sakaiproject.tool.assessment.facade.PublishedAssessmentFacadeQueries is not abstract and does not override abstract method getPublishedAssessment(java.lang.Long,boolean) in org.sakaiproject.tool.assessment.facade.PublishedAssessmentFacadeQueriesAPI

Due to:
http://jira.sakaiproject.org/browse/SAM-696

From the commits, the trunk and branch merges don't match and the branch is missing a method.


Steve