[maven-release-plugin] prepare release reset-pass-2.9.0-b07

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

git-svn-id: https://source.sakaiproject.org/svn/reset-pass/branches/reset-pass-2.9.x@111354 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/reset-pass%202.9.x/

git-svn-id: https://source.sakaiproject.org/svn/reset-pass/branches/reset-pass-2.9.x@111355 66ffb92e-73f9-0310-93c1-f5514f145a0a
dhorwitz@david-horwitz:~/branchManagement/reset-pass-2.9.x> svn log
-r111676 https://source.sakaiproject.org/svn/reset-pass/trunk
------------------------------------------------------------------------
r111676 | david.horwitz@uct.ac.za | 2012-08-21 14:46:55 +0200 (Tue, 21
Aug 2012) | 2 lines

RES-50 upgrade to RSF 0.7.5

------------------------------------------------------------------------
dhorwitz@david-horwitz:~/branchManagement/reset-pass-2.9.x> svn merge
-c111676 https://source.sakaiproject.org/svn/reset-pass/trunk
--- Merging r111676 into '.':
U    reset-pass/pom.xml



git-svn-id: https://source.sakaiproject.org/svn/reset-pass/branches/reset-pass-2.9.x@112283 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22014 - 2.9.x merge

svn merge -c110681 https://source.sakaiproject.org/svn/config/trunk/
Conflict discovered in 'configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties'.
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 r110681 into '.':
U    configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties

svn merge -c111980 https://source.sakaiproject.org/svn/config/trunk/
Conflict discovered in 'configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties'.
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 r111980 into '.':
G    configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties

svn merge -c111980 https://source.sakaiproject.org/svn/reset-pass/trunk/
--- Merging r111980 into '.':
U    reset-pass/src/java/org/sakaiproject/tool/resetpass/ConfirmProducer.java
U    reset-pass/src/java/org/sakaiproject/tool/resetpass/FormHandler.java

in-uits-gjthomas:site-manage gjthomas$ svn merge -c111980 https://source.sakaiproject.org/svn/site-manage/trunk/
--- Merging r111980 into '.':
U    site-manage-participant-helper/src/java/org/sakaiproject/site/tool/helper/participant/impl/SiteAddParticipantHandler.java


git-svn-id: https://source.sakaiproject.org/svn/reset-pass/branches/reset-pass-2.9.x@113234 66ffb92e-73f9-0310-93c1-f5514f145a0a
RES-47 merge r108401 from trunk

git-svn-id: https://source.sakaiproject.org/svn/reset-pass/branches/reset-pass-2.9.x@113491 66ffb92e-73f9-0310-93c1-f5514f145a0a
[maven-release-plugin] prepare release reset-pass-2.9.0-rc01

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

git-svn-id: https://source.sakaiproject.org/svn/reset-pass/branches/reset-pass-2.9.x@113565 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/reset-pass%202.9.x/

git-svn-id: https://source.sakaiproject.org/svn/reset-pass/branches/reset-pass-2.9.x@113566 66ffb92e-73f9-0310-93c1-f5514f145a0a