Uploaded image for project: 'Arquillian'
  1. Arquillian
  2. ARQ-370

Merge remote aslakknutsen/the_bigger_picture back into upstream/master

    Details

    • Type: Task
    • Status: Closed (View Workflow)
    • Priority: Major
    • Resolution: Done
    • Affects Version/s: None
    • Fix Version/s: 1.0.0.Alpha5
    • Component/s: None
    • Labels:
      None

      Description

      upstream/master should be the target integration branch.

      Due to features requested of Arquillian but unavailable in dependent projects, the "the_bigger_picture" branch was created to prototype upcoming, unstable development. Over time this has diverged from upstream/master and has become the current integration target, depending upon featureset branches from other projects.

      This task is set to track the changes and dependencies required to get a working merge back into upstream/master.

        Gliffy Diagrams

          Issue Links

            Activity

            Hide
            kpiwko Karel Piwko added a comment -

            Adding Arquillian Ajocado integration as Arquillian Ajocado should have an internal release before merging the_bigger_picture back to upstream/master as well.

            Show
            kpiwko Karel Piwko added a comment - Adding Arquillian Ajocado integration as Arquillian Ajocado should have an internal release before merging the_bigger_picture back to upstream/master as well.
            Hide
            aslak Aslak Knutsen added a comment -

            Merged arquillian/master into arquillian/next
            Rebased ALRubinger/ARQ-370 on top of arquillian/next
            Rebased kpiwko/ARQ-329 on top of arquillian/next
            Rebased kpiwko/ARQ-281 on top of arquillian/next

            Pushed to arquillian/next

            Show
            aslak Aslak Knutsen added a comment - Merged arquillian/master into arquillian/next Rebased ALRubinger/ ARQ-370 on top of arquillian/next Rebased kpiwko/ ARQ-329 on top of arquillian/next Rebased kpiwko/ ARQ-281 on top of arquillian/next Pushed to arquillian/next
            Hide
            aslak Aslak Knutsen added a comment -

            pushed to arquillian/arquillian:master

            Show
            aslak Aslak Knutsen added a comment - pushed to arquillian/arquillian:master

              People

              • Assignee:
                aslak Aslak Knutsen
                Reporter:
                alrubinger Andrew Rubinger
              • Votes:
                0 Vote for this issue
                Watchers:
                2 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved:

                  Development