[maven-release-plugin] prepare release emailtemplateservice-0.6.0-b07

git-svn-id: https://source.sakaiproject.org/svn/emailtemplateservice/branches/emailtemplateservice-0.6.x@111324 66ffb92e-73f9-0310-93c1-f5514f145a0a
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://source.sakaiproject.org/svn/emailtemplateservice/branches/emailtemplateservice-0.6.x@111326 66ffb92e-73f9-0310-93c1-f5514f145a0a
Jenkins pre-build: Auto-updating master version to 2.9-SNAPSHOT for next release http://builds.sakaiproject.org:8080/job/emailtemplateservice%200.6.x/

git-svn-id: https://source.sakaiproject.org/svn/emailtemplateservice/branches/emailtemplateservice-0.6.x@111327 66ffb92e-73f9-0310-93c1-f5514f145a0a
2.9.x merge

svn merge -c112383 -c112384 -c112385 https://source.sakaiproject.org/svn/emailtemplateservice/trunk/
--- Merging r112383 into '.':
U    impl/logic/src/test/org/sakaiproject/emailtemplateservice/logic/test/TestEmailTemplateService.java
U    impl/logic/src/java/org/sakaiproject/emailtemplateservice/service/impl/EmailTemplateServiceImpl.java
U    api/src/java/org/sakaiproject/emailtemplateservice/model/EmailTemplate.java
--- Merging r112384 into '.':
U    tool/src/webapp/templates/main.html
--- Merging r112385 into '.':
G    impl/logic/src/test/org/sakaiproject/emailtemplateservice/logic/test/TestEmailTemplateService.java
G    impl/logic/src/java/org/sakaiproject/emailtemplateservice/service/impl/EmailTemplateServiceImpl.java

svn log -c112383 -c112384 -c112385 https://source.sakaiproject.org/svn/emailtemplateservice/trunk/
------------------------------------------------------------------------
r112383 | david.horwitz@uct.ac.za | 2012-09-13 04:28:45 -0400 (Thu, 13 Sep 2012) | 2 lines

SAK-22223 don't use a null for locale

------------------------------------------------------------------------
r112384 | david.horwitz@uct.ac.za | 2012-09-13 05:04:18 -0400 (Thu, 13 Sep 2012) | 1 line

SAK-22223 Add the styles to the the page
------------------------------------------------------------------------
r112385 | david.horwitz@uct.ac.za | 2012-09-13 05:13:15 -0400 (Thu, 13 Sep 2012) | 1 line

SAK-22223 make sure the template locale is not empty
------------------------------------------------------------------------

svn merge -c112450 https://source.sakaiproject.org/svn/reference/trunk/
Conflict discovered in 'docs/conversion/sakai_2_9_0_oracle_conversion.sql'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: e
Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: r
--- Merging r112450 into '.':
U    docs/conversion/sakai_2_9_0_oracle_conversion.sql
Conflict discovered in 'docs/conversion/sakai_2_9_0_mysql_conversion.sql'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: e
Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: r
U    docs/conversion/sakai_2_9_0_mysql_conversion.sql

svn log -c112450 https://source.sakaiproject.org/svn/reference/trunk/
------------------------------------------------------------------------
r112450 | david.horwitz@uct.ac.za | 2012-09-14 09:35:54 -0400 (Fri, 14 Sep 2012) | 2 lines

SAK-22223 add conversions

------------------------------------------------------------------------



git-svn-id: https://source.sakaiproject.org/svn/emailtemplateservice/branches/emailtemplateservice-0.6.x@113208 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22376 merge r110383,r110384 from trunk

git-svn-id: https://source.sakaiproject.org/svn/emailtemplateservice/branches/emailtemplateservice-0.6.x@113325 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-21739 merge r112447,113174,113209,113261,113263,113264 from trunk

git-svn-id: https://source.sakaiproject.org/svn/emailtemplateservice/branches/emailtemplateservice-0.6.x@113431 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22498 SAK-22448 RSF version change. merge r113497 from trunk


git-svn-id: https://source.sakaiproject.org/svn/emailtemplateservice/branches/emailtemplateservice-0.6.x@113502 66ffb92e-73f9-0310-93c1-f5514f145a0a
[maven-release-plugin] prepare release emailtemplateservice-0.6.0-rc01

git-svn-id: https://source.sakaiproject.org/svn/emailtemplateservice/branches/emailtemplateservice-0.6.x@113547 66ffb92e-73f9-0310-93c1-f5514f145a0a
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://source.sakaiproject.org/svn/emailtemplateservice/branches/emailtemplateservice-0.6.x@113549 66ffb92e-73f9-0310-93c1-f5514f145a0a
Jenkins pre-build: Auto-updating master version to 2.9-SNAPSHOT for next release http://builds.sakaiproject.org:8080/job/emailtemplateservice%200.6.x/

git-svn-id: https://source.sakaiproject.org/svn/emailtemplateservice/branches/emailtemplateservice-0.6.x@113550 66ffb92e-73f9-0310-93c1-f5514f145a0a
dhorwitz@david-horwitz:~/branchManagement/emailtemplateservice-0.6.x>
svn log -r114115
https://source.sakaiproject.org/svn/emailtemplateservice/trunk
------------------------------------------------------------------------
r114115 | david.horwitz@uct.ac.za | 2012-10-09 12:50:13 +0200 (Tue, 09
Oct 2012) | 1 line

SAK-22761 check for nullity on update method
------------------------------------------------------------------------
dhorwitz@david-horwitz:~/branchManagement/emailtemplateservice-0.6.x>
svn merge -c114115
https://source.sakaiproject.org/svn/emailtemplateservice/trunk
--- Merging r114115 into '.':
U
impl/logic/src/java/org/sakaiproject/emailtemplateservice/service/impl/EmailTemplateServiceImpl.java



git-svn-id: https://source.sakaiproject.org/svn/emailtemplateservice/branches/emailtemplateservice-0.6.x@114116 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22321 merge r109505-109544 from trunk


git-svn-id: https://source.sakaiproject.org/svn/emailtemplateservice/branches/emailtemplateservice-0.6.x@114399 66ffb92e-73f9-0310-93c1-f5514f145a0a
[maven-release-plugin] prepare release emailtemplateservice-0.6.0-rc02

git-svn-id: https://source.sakaiproject.org/svn/emailtemplateservice/branches/emailtemplateservice-0.6.x@114632 66ffb92e-73f9-0310-93c1-f5514f145a0a
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://source.sakaiproject.org/svn/emailtemplateservice/branches/emailtemplateservice-0.6.x@114634 66ffb92e-73f9-0310-93c1-f5514f145a0a
Jenkins pre-build: Auto-updating master version to 2.9-SNAPSHOT for next release http://builds.sakaiproject.org:8080/job/emailtemplateservice%200.6.x/

git-svn-id: https://source.sakaiproject.org/svn/emailtemplateservice/branches/emailtemplateservice-0.6.x@114636 66ffb92e-73f9-0310-93c1-f5514f145a0a
[maven-release-plugin] prepare release emailtemplateservice-0.6.0-rc03

git-svn-id: https://source.sakaiproject.org/svn/emailtemplateservice/branches/emailtemplateservice-0.6.x@115489 66ffb92e-73f9-0310-93c1-f5514f145a0a
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://source.sakaiproject.org/svn/emailtemplateservice/branches/emailtemplateservice-0.6.x@115491 66ffb92e-73f9-0310-93c1-f5514f145a0a
Jenkins pre-build: Auto-updating master version to 2.9-SNAPSHOT for next release http://builds.sakaiproject.org:8080/job/emailtemplateservice%200.6.x/

git-svn-id: https://source.sakaiproject.org/svn/emailtemplateservice/branches/emailtemplateservice-0.6.x@115493 66ffb92e-73f9-0310-93c1-f5514f145a0a
[maven-release-plugin] prepare release emailtemplateservice-0.6.0

git-svn-id: https://source.sakaiproject.org/svn/emailtemplateservice/branches/emailtemplateservice-0.6.x@115944 66ffb92e-73f9-0310-93c1-f5514f145a0a
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://source.sakaiproject.org/svn/emailtemplateservice/branches/emailtemplateservice-0.6.x@115946 66ffb92e-73f9-0310-93c1-f5514f145a0a