Details

    • Type: Sub-task
    • Status: Closed
    • Priority: Normal
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: PDB 3.2.1
    • Component/s: None
    • Labels:
      None
    • Template:
    • Sprint:
      PuppetDB 2015-11-18

      Description

      For some releases, the code base will need to be merged down to stable.

      NOTE: This is usually only during a x.y.0 release, but even then it may have already been done. If it doesn't apply, close this ticket.

      Assuming you have origin (your remote) and upstream (puppetlabs remote), the commands will look something like this:

      git fetch upstream
      git rebase upstream/master
       
      git checkout stable
      git rebase upstream/stable
       
      git merge master --no-ff --log

      Once that looks good:

      git push origin
      git push upstream

      After merging to stable, the jobs on jenkins may require updates (spec, acceptance, etc) when you merge master into stable. Please ensure that the jenkins jobs are updated if necessary.

      Dependencies:

      • Is the code ready for release?
      • Reconcile git commits and JIRA tickets
      • Update version number in source

        Attachments

          Activity

            jsd-sla-details-panel

              People

              • Assignee:
                russell.mull Russell Mull
                Reporter:
                wyatt Wyatt Alt
              • Votes:
                0 Vote for this issue
                Watchers:
                1 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved: