[cle-release-team] 2.9.x update: KNL-1061 merge conflict due to KNL-1065

[Anthony Whyte]

The KNL-1061 merge conflict involving  /kernel/trunk/kernel-impl/src/test/java/org/sakaiproject/util/impl/FormattedTextTest.java r123409 is due to KNL-1065, r123381.  The latter ticket is listed as resolved but not verified and hence has yet to be merged to 2.9.x.

Since KNL-1061 was test successfully by Sam, I am going to change the status of KNL-1065 to verifed, merge in r123381 and then merge in the KNL-1061 fixes in order to break the log jam.

Anth
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://collab.sakaiproject.org/pipermail/cle-release-team/attachments/20130503/c78e5d76/attachment-0006.html