Uploaded image for project: 'Kuali Rice Development'
  1. Kuali Rice Development
  2. KULRICE-1761

Merge 0.9.3-kfs into 0.9.3, cut new 0.9.3-kfs branch

    Details

    • Type: Task
    • Status: Closed
    • Priority: Blocker
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: 0.9.3
    • Component/s: Source Control
    • Labels:
      None

      Description

      We need to merge the outstanding rice-release-0-9-3-kfs-080211-br branch into 0.9.3 and then cut a new kfs branch of rice.

        Attachments

          Issue Links

            Activity

            Hide
            ewestfal Eric Westfall added a comment -

            Merged has been completed, details below:

            $ svn merge -r 3193:HEAD https://test.kuali.org/svn/rice/branches/rice-release-0-9-3-kfs-080211-br/rice-release-0-9-3-br
            U ksb/src/main/java/edu/iu/uis/eden/messaging/config/KSBConfigurer.java
            U kew/src/main/java/edu/iu/uis/eden/core/WebApplicationGlobalResourceLifecycle.java
            U core/src/main/java/org/kuali/rice/lifecycle/ServiceDelegatingLifecycle.java
            U core/src/main/java/org/kuali/rice/config/RiceConfigurer.java
            U kns/src/test/resources/KR-ApplicationResources.properties
            U kns/src/test/webapp/WEB-INF/tags/kr/displayMultipleValueLookupResults.tag
            U kns/src/test/webapp/kr/WEB-INF/jsp/KualiMultipleValueLookup.jsp
            U kns/src/test/webapp/kr/WEB-INF/jsp/KualiLookup.jsp
            U kns/src/main/java/org/kuali/core/maintenance/Maintainable.java
            U kns/src/main/java/org/kuali/core/maintenance/KualiMaintainableImpl.java
            U kns/src/main/java/org/kuali/core/maintenance/UniversalUserMaintainable.java
            U kns/src/main/java/org/kuali/core/lookup/LookupableHelperService.java
            U kns/src/main/java/org/kuali/core/lookup/AbstractLookupableHelperServiceImpl.java
            U kns/src/main/java/org/kuali/core/util/MaintenanceUtils.java
            U kns/src/main/java/org/kuali/core/web/struts/form/MultipleValueLookupForm.java
            U kns/src/main/java/org/kuali/core/web/struts/form/LookupForm.java
            U kns/src/main/java/org/kuali/core/web/struts/action/KualiMaintenanceDocumentAction.java
            U kns/src/main/java/org/kuali/core/web/struts/action/KualiMultipleValueLookupAction.java
            U kns/src/main/java/org/kuali/core/web/struts/action/KualiLookupAction.java
            U kns/src/main/java/org/kuali/core/web/ui/FieldBridge.java
            U kns/src/main/java/org/kuali/core/web/ui/SectionBridge.java
            U kns/src/main/java/org/kuali/core/web/ui/ResultRow.java
            U kns/src/main/config/ddl/tables/FP_DOC_HEADER_T.table.ddl
            C kns/src/main/resources/KNSSpringBeans.xml

            Show
            ewestfal Eric Westfall added a comment - Merged has been completed, details below: $ svn merge -r 3193:HEAD https://test.kuali.org/svn/rice/branches/rice-release-0-9-3-kfs-080211-br/rice-release-0-9-3-br U ksb/src/main/java/edu/iu/uis/eden/messaging/config/KSBConfigurer.java U kew/src/main/java/edu/iu/uis/eden/core/WebApplicationGlobalResourceLifecycle.java U core/src/main/java/org/kuali/rice/lifecycle/ServiceDelegatingLifecycle.java U core/src/main/java/org/kuali/rice/config/RiceConfigurer.java U kns/src/test/resources/KR-ApplicationResources.properties U kns/src/test/webapp/WEB-INF/tags/kr/displayMultipleValueLookupResults.tag U kns/src/test/webapp/kr/WEB-INF/jsp/KualiMultipleValueLookup.jsp U kns/src/test/webapp/kr/WEB-INF/jsp/KualiLookup.jsp U kns/src/main/java/org/kuali/core/maintenance/Maintainable.java U kns/src/main/java/org/kuali/core/maintenance/KualiMaintainableImpl.java U kns/src/main/java/org/kuali/core/maintenance/UniversalUserMaintainable.java U kns/src/main/java/org/kuali/core/lookup/LookupableHelperService.java U kns/src/main/java/org/kuali/core/lookup/AbstractLookupableHelperServiceImpl.java U kns/src/main/java/org/kuali/core/util/MaintenanceUtils.java U kns/src/main/java/org/kuali/core/web/struts/form/MultipleValueLookupForm.java U kns/src/main/java/org/kuali/core/web/struts/form/LookupForm.java U kns/src/main/java/org/kuali/core/web/struts/action/KualiMaintenanceDocumentAction.java U kns/src/main/java/org/kuali/core/web/struts/action/KualiMultipleValueLookupAction.java U kns/src/main/java/org/kuali/core/web/struts/action/KualiLookupAction.java U kns/src/main/java/org/kuali/core/web/ui/FieldBridge.java U kns/src/main/java/org/kuali/core/web/ui/SectionBridge.java U kns/src/main/java/org/kuali/core/web/ui/ResultRow.java U kns/src/main/config/ddl/tables/FP_DOC_HEADER_T.table.ddl C kns/src/main/resources/KNSSpringBeans.xml
            Hide
            ewestfal Eric Westfall added a comment -

            New branch has been created at the following URL:

            https://test.kuali.org/svn/rice/branches/rice-release-0-9-3-kfs-080319-br

            Show
            ewestfal Eric Westfall added a comment - New branch has been created at the following URL: https://test.kuali.org/svn/rice/branches/rice-release-0-9-3-kfs-080319-br

              People

              • Assignee:
                ewestfal Eric Westfall
                Reporter:
                ewestfal Eric Westfall
              • Votes:
                0 Vote for this issue
                Watchers:
                0 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved:

                  Time Tracking

                  Estimated:
                  Original Estimate - 1 hour
                  1h
                  Remaining:
                  Remaining Estimate - 1 hour
                  1h
                  Logged:
                  Time Spent - Not Specified
                  Not Specified