Uploaded image for project: 'Puppet Server'
  1. Puppet Server
  2. SERVER-530

Merge up stable branch from 1.0.8 release commit to 2.1 branch

    XMLWordPrintable

Details

    • Task
    • Status: Closed
    • Normal
    • Resolution: Done
    • None
    • SERVER 2.1.0
    • None
    • None
    • 3
    • Server Emerald 2015-04-15, Server Emerald 2015-04-29

    Description

      As part of the work that we need to do for the Puppet Server 2.1 release, we should merge up the stable branch from the merge commit done for the 1.0.8 release up into the Puppet Server 2.1 development branch. Some points to keep in mind for this:

      1) This ticket depends upon the creation of the 2.1 development branch, which would be done as part of SERVER-533.

      2) The merge-up should occur from the 1.0.8 merge commit on stable and not HEAD of the stable branch. Work on the stable branch following the 1.0.8 merge commit is slated for Puppet Server 1.1 / 2.2.

      3) In the process of doing the merge-up, it would be good to identify the JIRA tickets that went into "SERVER 1.0.8" and tag them with "SERVER 2.1" to make the release process for 2.1 be a little easier later on.

      ---------
      Risk Assessment: N/A (This ticket creates a release.)

      Attachments

        Issue Links

          Activity

            People

              erik Erik Dasher
              jeremy.barlow Jeremy Barlow
              Erik Dasher Erik Dasher
              Votes:
              0 Vote for this issue
              Watchers:
              3 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved:

                Zendesk Support