Details

    • Type: Task Task
    • Status: Closed
    • Priority: Major Major
    • Resolution: Fixed
    • Affects Version/s: 10.2.1.6
    • Fix Version/s: 10.2.1.6
    • Component/s: Build tools
    • Labels:
      None

      Description

      This is a placeholder for recording merges from the trunk to the 10.2 branch.

      1. derby-1725-merge-430830-to-430856.diff
        4 kB
        Rick Hillegas
      2. derby-1725-merge-430858-to-430945.diff
        32 kB
        Rick Hillegas
      3. derby-1725-merge-430947-to-431743.diff
        63 kB
        Rick Hillegas
      4. derby-1725-merge-431745-to-432654.diff
        244 kB
        Rick Hillegas
      5. derby-1725-merge-432705.diff
        1 kB
        Rick Hillegas
      6. derby-1725-merge-432929.diff
        8 kB
        Rick Hillegas
      7. derby-1725-merge-433272-to-433447.diff
        32 kB
        Rick Hillegas
      8. derby-1725-merge-433272-to-433447.diff
        32 kB
        Rick Hillegas
      9. derby-1725-merge-433606-to-433791.diff
        71 kB
        Rick Hillegas
      10. derby-1725-merge-433930-to-434409.diff
        394 kB
        Rick Hillegas
      11. derby-1725-merge-434562.diff
        9 kB
        Rick Hillegas
      12. derby-1725-merge-434576-to-436654.diff
        17 kB
        Rick Hillegas
      13. derby-1725-merge-436659-to-436821.diff
        99 kB
        Rick Hillegas
      14. derby-1725-merge-436937-to-437071.diff
        66 kB
        Rick Hillegas
      15. derby-1725-merge-437821-to-437833.diff
        35 kB
        Rick Hillegas
      16. derby-1725-merge-438121-to-438579.diff
        45 kB
        Rick Hillegas
      17. derby-1725-merge-438970-to-438997.diff
        13 kB
        Rick Hillegas
      18. derby-1725-merge-439047-to-439210.diff
        85 kB
        Rick Hillegas
      19. derby-1725-merge-439314-to-439316.diff
        2 kB
        Rick Hillegas
      20. derby-1725-merge-439334-to-441427.diff
        1.89 MB
        Rick Hillegas
      21. derby-1725-merge-441583-to-441723.diff
        71 kB
        Rick Hillegas
      22. derby-1725-merge-441778-to-442648.diff
        125 kB
        Rick Hillegas
      23. derby-1725-merge-442673-to-442738.diff
        4 kB
        Rick Hillegas
      24. derby-1725-merge-443037-to-446673.diff
        30 kB
        Rick Hillegas
      25. derby-1725-merge-446674-to-447814.diff
        250 kB
        Rick Hillegas
      26. derby-1725-merge-447857-to-447878.diff
        14 kB
        Rick Hillegas
      27. derby-1725-merge-447878-to-447923.diff
        18 kB
        Rick Hillegas
      28. derby-1725-merge-447924-to-448464.diff
        122 kB
        Rick Hillegas
      29. derby-1725-merge-448466-to-448901.diff
        27 kB
        Rick Hillegas
      30. derby-1725-merge-448902-to-448950.diff
        4 kB
        Rick Hillegas
      31. derby-1725-merge-449325-to-449327.diff
        0.6 kB
        Rick Hillegas
      32. derby-1725-merge-449868-to-449869.diff
        10 kB
        Rick Hillegas
      33. derby-1725-merge-451362-to-451363.diff
        2 kB
        Rick Hillegas
      34. derby-1725-merge-451431-to-451432.diff
        0.9 kB
        Rick Hillegas
      35. derby-1725-mergeDocs-430831-to-432716.diff
        91 kB
        Rick Hillegas
      36. derby-1725-mergeDocs-432717-to-436939.diff
        166 kB
        Rick Hillegas
      37. derby-1725-mergeDocs-436940-to-439136.diff
        40 kB
        Rick Hillegas
      38. derby-1725-mergeDocs-439137-to-441308.diff
        185 kB
        Rick Hillegas
      39. derby-1725-mergeDocs-441308-to-446544.diff
        370 kB
        Rick Hillegas
      40. derby-1725-mergeDocs-446545-to-448988.diff
        58 kB
        Rick Hillegas
      41. derby-1725-sqlstates-v01.diff
        278 kB
        Rick Hillegas
      42. derby-1725-sqlstates-v02.diff
        7 kB
        Rick Hillegas

        Activity

        Hide
        Rick Hillegas added a comment -

        Committed derby-1725-merge-430830-to-430856.diff, merging the trunk into the 10.2 branch from 430830 through 430856. Committed merge at subversion revision 432641.

        Show
        Rick Hillegas added a comment - Committed derby-1725-merge-430830-to-430856.diff, merging the trunk into the 10.2 branch from 430830 through 430856. Committed merge at subversion revision 432641.
        Hide
        Rick Hillegas added a comment -

        Committed derby-1725-merge-430858-to-430945.diff, merging the trunk into the 10.2 branch from 43058 through 430945. Committed at subversion revision 432651.

        Show
        Rick Hillegas added a comment - Committed derby-1725-merge-430858-to-430945.diff, merging the trunk into the 10.2 branch from 43058 through 430945. Committed at subversion revision 432651.
        Hide
        Rick Hillegas added a comment -

        Committed derby-1725-merge-430947-to-431743.diff, merging the trunk into the 10.2 branch from 430947 to 431743. Committed at subversion revision 432658.

        Show
        Rick Hillegas added a comment - Committed derby-1725-merge-430947-to-431743.diff, merging the trunk into the 10.2 branch from 430947 to 431743. Committed at subversion revision 432658.
        Hide
        Andrew McIntyre added a comment -

        I noticed part of the change for DERBY-1593 snuck in with the change that bumped the version to 10.3. I've merged the necessary bit of tools/release/build.xml. Rick, please svn up to get the change before building the next beta.

        Show
        Andrew McIntyre added a comment - I noticed part of the change for DERBY-1593 snuck in with the change that bumped the version to 10.3. I've merged the necessary bit of tools/release/build.xml. Rick, please svn up to get the change before building the next beta.
        Hide
        Rick Hillegas added a comment -

        Committed derby-1725-merge-431745-to-432654.diff, merging the trunk to the 10.2 branch from 431745 through 432654. Committed at subversion revision 432679. This includes patches applied to the following JIRAs: DERBY-244 DERBY-1710 DERBY-1712 DERBY-1555 DERBY-1701 DERBY-1691 DERBY-1681 DERBY-1032 DERBY-1692

        Show
        Rick Hillegas added a comment - Committed derby-1725-merge-431745-to-432654.diff, merging the trunk to the 10.2 branch from 431745 through 432654. Committed at subversion revision 432679. This includes patches applied to the following JIRAs: DERBY-244 DERBY-1710 DERBY-1712 DERBY-1555 DERBY-1701 DERBY-1691 DERBY-1681 DERBY-1032 DERBY-1692
        Hide
        Rick Hillegas added a comment -

        Dummy commit at subversion revision 432715. This records the merge actions of the previous commits. Patches for the following JIRAs merged as follows:

        Merge 1 (432641): DERBY-1556.

        Merge 2 (432651): DERBY-1130 DERBY-1556 DERBY-1593.

        Merge 3 (432658): DERBY-415 DERBY-1652 DERBY-1694 DERBY-1691 DERBY-1688 DERBY-1574 DERBY-766 DERBY-1664 DERBY-634.

        Merge 4 (432679): DERBY-244 DERBY-1710 DERBY-1712 DERBY-1555 DERBY-1701 DERBY-1691 DERBY-1681 DERBY-1032 DERBY-1692

        Show
        Rick Hillegas added a comment - Dummy commit at subversion revision 432715. This records the merge actions of the previous commits. Patches for the following JIRAs merged as follows: Merge 1 (432641): DERBY-1556 . Merge 2 (432651): DERBY-1130 DERBY-1556 DERBY-1593 . Merge 3 (432658): DERBY-415 DERBY-1652 DERBY-1694 DERBY-1691 DERBY-1688 DERBY-1574 DERBY-766 DERBY-1664 DERBY-634 . Merge 4 (432679): DERBY-244 DERBY-1710 DERBY-1712 DERBY-1555 DERBY-1701 DERBY-1691 DERBY-1681 DERBY-1032 DERBY-1692
        Hide
        Rick Hillegas added a comment -

        Committed derby-1725-mergeDocs-430831-to-432716.diff. This merges documentation changes from the mainline to the 10.2 branch from branch creation at 430831 through 432716. This includes patches to the following JIRAs: DERBY-931 DERBY-1549 DERBY-1570 DERBY-1057 DERBY-1548 DERBY-1551. Committed at subversion revision 432721.

        Show
        Rick Hillegas added a comment - Committed derby-1725-mergeDocs-430831-to-432716.diff. This merges documentation changes from the mainline to the 10.2 branch from branch creation at 430831 through 432716. This includes patches to the following JIRAs: DERBY-931 DERBY-1549 DERBY-1570 DERBY-1057 DERBY-1548 DERBY-1551 . Committed at subversion revision 432721.
        Hide
        Rick Hillegas added a comment -

        Commit derby-1725-merge-432705.diff. This merges some javadoc airbrushing. No JIRA associated with the original airbrushing. Committed at subversion revision 436851.

        Show
        Rick Hillegas added a comment - Commit derby-1725-merge-432705.diff. This merges some javadoc airbrushing. No JIRA associated with the original airbrushing. Committed at subversion revision 436851.
        Hide
        Rick Hillegas added a comment -

        Commit derby-1725-merge-432929.diff, merging 432929 from trunk to branch. This is a patch for DERBY-1538. Committed at subversion revision 436859.

        Show
        Rick Hillegas added a comment - Commit derby-1725-merge-432929.diff, merging 432929 from trunk to branch. This is a patch for DERBY-1538 . Committed at subversion revision 436859.
        Hide
        Rick Hillegas added a comment -

        Committed derby-1725-merge-433272-to-433447.diff at subversion revision 436875. This merges the following patches from the trunk to the 10.2 branch: DERBY-1739 (433446), DERBY-744 (433445, 433443), DERBY-1734 (433434, 433349, ), DERBY-1609 (433331, 433274, 433273).

        Show
        Rick Hillegas added a comment - Committed derby-1725-merge-433272-to-433447.diff at subversion revision 436875. This merges the following patches from the trunk to the 10.2 branch: DERBY-1739 (433446), DERBY-744 (433445, 433443), DERBY-1734 (433434, 433349, ), DERBY-1609 (433331, 433274, 433273).
        Hide
        Rick Hillegas added a comment -

        Commit derby-1725-433486-to-433492.diff at subversion revision 436898. This merges from the trunk to the 10.2 branch: DERBY-1739 (433491, 433487).

        Show
        Rick Hillegas added a comment - Commit derby-1725-433486-to-433492.diff at subversion revision 436898. This merges from the trunk to the 10.2 branch: DERBY-1739 (433491, 433487).
        Hide
        Rick Hillegas added a comment -

        Commit derby-1725-merge-433606-to-433791.diff at subversion revision 436905. This merges to 10.2 the following: No JIRA (433790), DERBY-1674 (433688, 433685, 433655, 433632), DERBY-1558 (433607).

        Show
        Rick Hillegas added a comment - Commit derby-1725-merge-433606-to-433791.diff at subversion revision 436905. This merges to 10.2 the following: No JIRA (433790), DERBY-1674 (433688, 433685, 433655, 433632), DERBY-1558 (433607).
        Hide
        Rick Hillegas added a comment -

        Commit derby-1725-merge-433930-to-434409.diff at subversion revision 436921. This merges the following patches from the trunk to 10.2: No JIRA (434169, 433931), DERBY-1582 (434408), DERBY-1500 (434309), DERBY-1555 (434273, 434257, 434192), DERBY-1691 (434245), DERBY-1633 (434111), DERBY-1674 (434100), DERBY-1734 (434083), DERBY-1621 (434046), DERBY-1743 (434018).

        Show
        Rick Hillegas added a comment - Commit derby-1725-merge-433930-to-434409.diff at subversion revision 436921. This merges the following patches from the trunk to 10.2: No JIRA (434169, 433931), DERBY-1582 (434408), DERBY-1500 (434309), DERBY-1555 (434273, 434257, 434192), DERBY-1691 (434245), DERBY-1633 (434111), DERBY-1674 (434100), DERBY-1734 (434083), DERBY-1621 (434046), DERBY-1743 (434018).
        Hide
        Rick Hillegas added a comment -

        Commit derby-1725-merge-434576-to-436654 at subversion revision 436929. Ports the following patches from trunk to 10.2 branch: No JIRA (436653, 434587, 434586, 434581), DERBY-1708 (434577).

        Show
        Rick Hillegas added a comment - Commit derby-1725-merge-434576-to-436654 at subversion revision 436929. Ports the following patches from trunk to 10.2 branch: No JIRA (436653, 434587, 434586, 434581), DERBY-1708 (434577).
        Hide
        Rick Hillegas added a comment -

        Commit derby-1725-merge-434562.diff at subversion revision 436933. Merges 434562 (no JIRA) from trunk to 10.2 branch.

        Show
        Rick Hillegas added a comment - Commit derby-1725-merge-434562.diff at subversion revision 436933. Merges 434562 (no JIRA) from trunk to 10.2 branch.
        Hide
        Rick Hillegas added a comment -

        Commit derby-1725-merge-436659-to-436821 at subversion revision 436936. This merges the following patches from the trunk to the 10.2 branch: No JIRA (436820, 436817, 436660), DERBY-1695 / DERBY-528 (436672).

        Show
        Rick Hillegas added a comment - Commit derby-1725-merge-436659-to-436821 at subversion revision 436936. This merges the following patches from the trunk to the 10.2 branch: No JIRA (436820, 436817, 436660), DERBY-1695 / DERBY-528 (436672).
        Hide
        Rick Hillegas added a comment -

        Commit derby-1725-mergeDocs-432717-to-436939.diff at subversion revision 436974. This mega merges the documentation from the trunk to the 10.2 branch. Merges the following patches: No JIRA (436666, 433940, 432774), DERBY-1215 (436920), DERBY-1601 (436908), DERBY-1655 (436862, 434236, 434125, 433708, 433307, 433298), DERBY-1685 (434580), DERBY-1747 (434542), DERBY-1682 (434218), DERBY-1731 (434159), DERBY-753 (434003), DERBY-1565 (433873), DERBY-935 / DERBY-1565 (433814), DERBY-1622 (433290, 432775), DERBY-1717 (432771).

        Show
        Rick Hillegas added a comment - Commit derby-1725-mergeDocs-432717-to-436939.diff at subversion revision 436974. This mega merges the documentation from the trunk to the 10.2 branch. Merges the following patches: No JIRA (436666, 433940, 432774), DERBY-1215 (436920), DERBY-1601 (436908), DERBY-1655 (436862, 434236, 434125, 433708, 433307, 433298), DERBY-1685 (434580), DERBY-1747 (434542), DERBY-1682 (434218), DERBY-1731 (434159), DERBY-753 (434003), DERBY-1565 (433873), DERBY-935 / DERBY-1565 (433814), DERBY-1622 (433290, 432775), DERBY-1717 (432771).
        Hide
        Rick Hillegas added a comment -

        Committed derby-1725-merge-436937-to-437071.diff at subversion revision 439358. This merges the following patches from the trunk to the 10.2 branch: No JIRA (436955), DERBY-883 (437070), DERBY-1555 (437009, 436965, 436957).

        Show
        Rick Hillegas added a comment - Committed derby-1725-merge-436937-to-437071.diff at subversion revision 439358. This merges the following patches from the trunk to the 10.2 branch: No JIRA (436955), DERBY-883 (437070), DERBY-1555 (437009, 436965, 436957).
        Hide
        Rick Hillegas added a comment -

        Committed derby-1725-merge-437821-to-437833.diff at subversion revision 439361. This merges the following patches from the trunk to the 10.2 branch: DERBY-1555 (437832), DERBY-1674 (437823 ), DERBY-1292 (437822).

        Show
        Rick Hillegas added a comment - Committed derby-1725-merge-437821-to-437833.diff at subversion revision 439361. This merges the following patches from the trunk to the 10.2 branch: DERBY-1555 (437832), DERBY-1674 (437823 ), DERBY-1292 (437822).
        Hide
        Rick Hillegas added a comment -

        Commit derby-1725-merge-438121-to-438579.diff at subversion revision 439370. This merges the following patches from the trunk to the 10.2 branch: No JIRA (438578, 438489, 438289, 438273, 438211), DERBY-1559 (438478), DERBY-1555 (438299), DERBY-1130 (438122).

        Show
        Rick Hillegas added a comment - Commit derby-1725-merge-438121-to-438579.diff at subversion revision 439370. This merges the following patches from the trunk to the 10.2 branch: No JIRA (438578, 438489, 438289, 438273, 438211), DERBY-1559 (438478), DERBY-1555 (438299), DERBY-1130 (438122).
        Hide
        Rick Hillegas added a comment -

        Commit derby-1725-merge-438970-to-438997 at subversion revision 439372. This merges the following patches from the trunk to the 10.2 branch: No JIRA (438996, 438972, 438971), DERBY-1555 (438975).

        Show
        Rick Hillegas added a comment - Commit derby-1725-merge-438970-to-438997 at subversion revision 439372. This merges the following patches from the trunk to the 10.2 branch: No JIRA (438996, 438972, 438971), DERBY-1555 (438975).
        Hide
        Rick Hillegas added a comment -

        Commit derby-1725-merge-439047-to-439210.diff at subversion revision 439377. This merges the following patches from the trunk to the 10.2 branch: No JIRA (439048), DERBY-1702 (439209), DERBY-1783 (439128), DERBY-1315 (439098, 439083), DERBY-1566 (439093).

        Show
        Rick Hillegas added a comment - Commit derby-1725-merge-439047-to-439210.diff at subversion revision 439377. This merges the following patches from the trunk to the 10.2 branch: No JIRA (439048), DERBY-1702 (439209), DERBY-1783 (439128), DERBY-1315 (439098, 439083), DERBY-1566 (439093).
        Hide
        Rick Hillegas added a comment -

        Commit derby-1725-merge-439314-to-439316.diff at subversion revision 439382. This merges the following patch from the trunk to the 10.2 branch: DERBY-1566 (439315).

        Show
        Rick Hillegas added a comment - Commit derby-1725-merge-439314-to-439316.diff at subversion revision 439382. This merges the following patch from the trunk to the 10.2 branch: DERBY-1566 (439315).
        Hide
        Rick Hillegas added a comment -

        Commit derby-1725-mergeDocs-436940-to-439136.diff at subversion revision 439393. This merges the following documentation patches from the trunk to the 10.2 branch: No JIRA (439040, 438715), DERBY-502 (438714), DERBY-1747 (438322), DERBY-1636 (438307), DERBY-1575 (438290), DERBY-1636 (437069).

        Show
        Rick Hillegas added a comment - Commit derby-1725-mergeDocs-436940-to-439136.diff at subversion revision 439393. This merges the following documentation patches from the trunk to the 10.2 branch: No JIRA (439040, 438715), DERBY-502 (438714), DERBY-1747 (438322), DERBY-1636 (438307), DERBY-1575 (438290), DERBY-1636 (437069).
        Hide
        Rick Hillegas added a comment -

        Commit derby-1725-sqlstates-v01.diff. This is the generated list of current SQLStates for the Reference Guide. Committed at subversion revision 439404.

        Show
        Rick Hillegas added a comment - Commit derby-1725-sqlstates-v01.diff. This is the generated list of current SQLStates for the Reference Guide. Committed at subversion revision 439404.
        Hide
        Rick Hillegas added a comment -

        Committed derby-1725-merge-439334-to-441427.diff at subversion revision 441540.

        This merges the following patches from the trunk to the 10.2 branch:

        No JIRA (441088, 440846),
        DERBY-706 (441426),
        DERBY-1700 (441232, 440762),
        DERBY-1767 (441185),
        DERBY-1729 (441140),
        DERBY-1686 (441131),
        DERBY-1700 (441105, 439861),
        DERBY-1802 (441098, 441097),
        DERBY-1491 (440550),
        DERBY-1813 (440517),
        DERBY-1791 (440373),
        DERBY-1768 (440321),
        DERBY-1800 (440062),
        DERBY-1790 (439845),
        DERBY-1756 (439775),
        DERBY-1810 (439702),
        DERBY-1702 (439335)

        Show
        Rick Hillegas added a comment - Committed derby-1725-merge-439334-to-441427.diff at subversion revision 441540. This merges the following patches from the trunk to the 10.2 branch: No JIRA (441088, 440846), DERBY-706 (441426), DERBY-1700 (441232, 440762), DERBY-1767 (441185), DERBY-1729 (441140), DERBY-1686 (441131), DERBY-1700 (441105, 439861), DERBY-1802 (441098, 441097), DERBY-1491 (440550), DERBY-1813 (440517), DERBY-1791 (440373), DERBY-1768 (440321), DERBY-1800 (440062), DERBY-1790 (439845), DERBY-1756 (439775), DERBY-1810 (439702), DERBY-1702 (439335)
        Hide
        Rick Hillegas added a comment -

        Commit derby-1725-mergeDocs-439137-to-441308.diff at subversion revision 441555. This merges the following patches from the trunk to the 10.2 branch:

        No JIRA (441134, 440639),
        DERBY-1821 (441307),
        DERBY-1765 (441291),
        DERBY-1821 (441209),
        DERBY-1072 (441143),
        DERBY-1805 (440984),
        DERBY-408 (440981),
        DERBY-1646 (440851),
        DERBY-1682 (440848),
        DERBY-1798 (439838)

        Show
        Rick Hillegas added a comment - Commit derby-1725-mergeDocs-439137-to-441308.diff at subversion revision 441555. This merges the following patches from the trunk to the 10.2 branch: No JIRA (441134, 440639), DERBY-1821 (441307), DERBY-1765 (441291), DERBY-1821 (441209), DERBY-1072 (441143), DERBY-1805 (440984), DERBY-408 (440981), DERBY-1646 (440851), DERBY-1682 (440848), DERBY-1798 (439838)
        Hide
        Rick Hillegas added a comment -

        Commit derby-1725-sqlstates-v02.diff at subversion revision 441566. This updates the sqlstates documentation for the next beta candidate.

        Show
        Rick Hillegas added a comment - Commit derby-1725-sqlstates-v02.diff at subversion revision 441566. This updates the sqlstates documentation for the next beta candidate.
        Hide
        Rick Hillegas added a comment -

        Committed derby-1725-merge-441583-to-441723.diff at subversion revision 446679. This merges the following patches from the trunk to the 10.2 branch:

        DERBY-1675 (441722),
        DERBY-1809 (441601),
        DERBY-15222 (441584)

        Show
        Rick Hillegas added a comment - Committed derby-1725-merge-441583-to-441723.diff at subversion revision 446679. This merges the following patches from the trunk to the 10.2 branch: DERBY-1675 (441722), DERBY-1809 (441601), DERBY-15222 (441584)
        Hide
        Rick Hillegas added a comment -

        Committed derby-1725-merge-441778-to-442648.diff at subversion revision 446700. This merges the following patches from the trunk to the 10.2 branch:

        DERBY-1786 (442647),
        DERBY-1843 (442646),
        DERBY-803 (442490),
        DERBY-1832 (442464),
        DERBY-1817 (442463, 442462, 441802),
        DERBY-1691 (442199),
        DERBY-1767 (441789),
        DERBY-1675 (441779)

        Show
        Rick Hillegas added a comment - Committed derby-1725-merge-441778-to-442648.diff at subversion revision 446700. This merges the following patches from the trunk to the 10.2 branch: DERBY-1786 (442647), DERBY-1843 (442646), DERBY-803 (442490), DERBY-1832 (442464), DERBY-1817 (442463, 442462, 441802), DERBY-1691 (442199), DERBY-1767 (441789), DERBY-1675 (441779)
        Hide
        Rick Hillegas added a comment -

        Commit derby-1725-merge-442673-to-442738.diff at subversion revision 446703. This merges the following patches from the trunk to the 10.2 branch:

        No JIRA (442737, 442677),
        DERBY-1032 (442674)

        Show
        Rick Hillegas added a comment - Commit derby-1725-merge-442673-to-442738.diff at subversion revision 446703. This merges the following patches from the trunk to the 10.2 branch: No JIRA (442737, 442677), DERBY-1032 (442674)
        Hide
        Rick Hillegas added a comment -

        Committed derby-1725-merge-443037-to-446673.diff at subversion revision 446709. This merges the following patches from the trunk to the 10.2 branch:

        No JIRA (443076, 442761),
        DERBY-1853 (446672),
        DERBY-1729 (446652),
        DERBY-1326 (446538),
        DERBY-1665 (446536),
        DERBY-1741 (446527),
        DERBY-1846 (443169),
        DERBY-1846 (443167),
        DERBY-1618 (443038),
        DERBY-1833 (442958)

        Show
        Rick Hillegas added a comment - Committed derby-1725-merge-443037-to-446673.diff at subversion revision 446709. This merges the following patches from the trunk to the 10.2 branch: No JIRA (443076, 442761), DERBY-1853 (446672), DERBY-1729 (446652), DERBY-1326 (446538), DERBY-1665 (446536), DERBY-1741 (446527), DERBY-1846 (443169), DERBY-1846 (443167), DERBY-1618 (443038), DERBY-1833 (442958)
        Hide
        Rick Hillegas added a comment -

        Committed derby-1725-mergeDocs-441308-to-446544.diff at subversion revision 446722. This merges the following documentation patches from the trunk to the 10.2 branch:

        DERBY-1804 (446543),
        DERBY-1820 (442769),
        DERBY-1659 (442496),
        DERBY-1223 (442401),
        DERBY-1566 (442381),
        DERBY-1803 (442374)

        Show
        Rick Hillegas added a comment - Committed derby-1725-mergeDocs-441308-to-446544.diff at subversion revision 446722. This merges the following documentation patches from the trunk to the 10.2 branch: DERBY-1804 (446543), DERBY-1820 (442769), DERBY-1659 (442496), DERBY-1223 (442401), DERBY-1566 (442381), DERBY-1803 (442374)
        Hide
        Rick Hillegas added a comment -

        Commit derby-1725-merge-446674-to-447814.diff at subversion revision 448961. This merges the following patches from the trunk to the 10.2 branch:

        DERBY-1694 (447736),
        DERBY-1589 (447644),
        DERBY-1588 (447502),
        DERBY-1784 (447469),
        DERBY-1326 (447462, 447375),
        DERBY-1706 (447212),
        DERBY-1707 (447011),
        DERBY-1777 (446924),
        DERBY-1736 (446789)

        Show
        Rick Hillegas added a comment - Commit derby-1725-merge-446674-to-447814.diff at subversion revision 448961. This merges the following patches from the trunk to the 10.2 branch: DERBY-1694 (447736), DERBY-1589 (447644), DERBY-1588 (447502), DERBY-1784 (447469), DERBY-1326 (447462, 447375), DERBY-1706 (447212), DERBY-1707 (447011), DERBY-1777 (446924), DERBY-1736 (446789)
        Hide
        Rick Hillegas added a comment -

        Commit derby-1725-merge-447857-to-447878.diff at subversion revision 448966. This merges the following patch from the trunk to the 10.2 branch:

        DERBY-147 (447877)

        Show
        Rick Hillegas added a comment - Commit derby-1725-merge-447857-to-447878.diff at subversion revision 448966. This merges the following patch from the trunk to the 10.2 branch: DERBY-147 (447877)
        Hide
        Rick Hillegas added a comment -

        Committed derby-1725-merge-447878-to-447923.diff at subversion revision 448991. This merges the following patch from the trunk to the 10.2 branch:

        DERBY-1547 (447922)

        Show
        Rick Hillegas added a comment - Committed derby-1725-merge-447878-to-447923.diff at subversion revision 448991. This merges the following patch from the trunk to the 10.2 branch: DERBY-1547 (447922)
        Hide
        Rick Hillegas added a comment -

        Committed derby-1725-merge-447924-to-448464.diff at subversion revision 449004. This merges the following patches from the trunk to the 10.2 branch:

        DERBY-1811 (448456),
        DERBY-1787 (448424),
        DERBY-1700 (448338, 448286),
        DERBY-1775 (448258),
        DERBY-1869 (448133),
        DERBY-1834 (448101),
        DERBY-1718 (448085),
        DERBY-1772 (448048),
        DERBY-1766 (448034),
        DERBY-1304 (448026),
        DERBY-1547 (448003),
        DERBY-1846 (447970)

        Show
        Rick Hillegas added a comment - Committed derby-1725-merge-447924-to-448464.diff at subversion revision 449004. This merges the following patches from the trunk to the 10.2 branch: DERBY-1811 (448456), DERBY-1787 (448424), DERBY-1700 (448338, 448286), DERBY-1775 (448258), DERBY-1869 (448133), DERBY-1834 (448101), DERBY-1718 (448085), DERBY-1772 (448048), DERBY-1766 (448034), DERBY-1304 (448026), DERBY-1547 (448003), DERBY-1846 (447970)
        Hide
        Rick Hillegas added a comment -

        Committed derby-1725-merge-448466-to-448901.diff at subversion revision 449013. This merges the following patches from the trunk to the 10.2 branch:

        No JIRA (448472),
        DERBY-1826 (448900),
        DERBY-1834 (448833),
        DERBY-1854 (448758),
        DERBY-1776 (448691),
        DERBY-1846 (448617)

        Show
        Rick Hillegas added a comment - Committed derby-1725-merge-448466-to-448901.diff at subversion revision 449013. This merges the following patches from the trunk to the 10.2 branch: No JIRA (448472), DERBY-1826 (448900), DERBY-1834 (448833), DERBY-1854 (448758), DERBY-1776 (448691), DERBY-1846 (448617)
        Hide
        Rick Hillegas added a comment -

        Committed derby-1725-mergeDocs-446545-to-448988.diff at subversion revision 449063. This merges the following documentation patches from the trunk to the 10.2 branch:

        DERBY-1839 (448987),
        DERBY-1821 (448772),
        DERBY-1873 (448731),
        DERBY-1659 (448620)

        Show
        Rick Hillegas added a comment - Committed derby-1725-mergeDocs-446545-to-448988.diff at subversion revision 449063. This merges the following documentation patches from the trunk to the 10.2 branch: DERBY-1839 (448987), DERBY-1821 (448772), DERBY-1873 (448731), DERBY-1659 (448620)
        Hide
        Rick Hillegas added a comment -

        Committed derby-1725-merge-448902-to-448950.diff at subversion revision 449086. This merges the following patches from the trunk to the 10.2 branch:

        No JIRA (448948),
        DERBY-1862 (448949)

        Show
        Rick Hillegas added a comment - Committed derby-1725-merge-448902-to-448950.diff at subversion revision 449086. This merges the following patches from the trunk to the 10.2 branch: No JIRA (448948), DERBY-1862 (448949)
        Hide
        Rick Hillegas added a comment -

        Commit derby-1725-merge-449325-to-449327.diff at subversion revision 449329. This merges DERBY-1529 from trunk to 10.2 branch.

        Show
        Rick Hillegas added a comment - Commit derby-1725-merge-449325-to-449327.diff at subversion revision 449329. This merges DERBY-1529 from trunk to 10.2 branch.
        Hide
        Rick Hillegas added a comment -

        Committed derby-1725-merge-451362-to-451363.diff at revision 451372. This merges DERBY-1899 from the trunk to the 10.2 branch.

        Show
        Rick Hillegas added a comment - Committed derby-1725-merge-451362-to-451363.diff at revision 451372. This merges DERBY-1899 from the trunk to the 10.2 branch.
        Hide
        Rick Hillegas added a comment -

        Commit derby-1725-merge-451431-to-451432.diff at subversion revision 451434. This merges DERBY-1885 from the trunk to the 10.2 branch.

        Show
        Rick Hillegas added a comment - Commit derby-1725-merge-451431-to-451432.diff at subversion revision 451434. This merges DERBY-1885 from the trunk to the 10.2 branch.
        Hide
        Rick Hillegas added a comment -

        Commit derby-1725-merge-449868-to-449869.diff at subversion revision 451658. This merges DERBY-1858 from trunk to 10.2 branch.

        Show
        Rick Hillegas added a comment - Commit derby-1725-merge-449868-to-449869.diff at subversion revision 451658. This merges DERBY-1858 from trunk to 10.2 branch.
        Hide
        Rick Hillegas added a comment -

        Wrapping up work on 10.2.1

        Show
        Rick Hillegas added a comment - Wrapping up work on 10.2.1

          People

          • Assignee:
            Rick Hillegas
            Reporter:
            Rick Hillegas
          • Votes:
            0 Vote for this issue
            Watchers:
            0 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved:

              Development