Merge release tags back into master

[Mark McLoughlin]

As discussed here:

  http://lists.openstack.org/pipermail/openstack-dev/2013-June/thread.html#10508

It might be nice to merge release tags back into master e.g.

  $> git checkout 0e760b3
  $> git merge -s ours 2013.2.b1
  $> git show --pretty=raw 0e760b3 | grep '^tree'
  tree aae4de9b4e193a3784d7530fdcda0cce6f905683
  $> git show --pretty=raw HEAD | grep '^tree'
  tree aae4de9b4e193a3784d7530fdcda0cce6f905683

(0e760b3 is just to show what would have been the tip of master when ttx created 2013.2.b1)

Monty says there's a few logistical issues before we can do that.

[Monty Taylor (mordred)]

We're going to try doing this with swift after their 1.9.1 release.

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/41927
Committed: http://github.com/openstack-infra/config/commit/50d8020efe95fcde49d588767f36e377bbffa57b
Submitter: Jenkins
Branch: master

commit 50d8020efe95fcde49d588767f36e377bbffa57b
Author: Monty Taylor <email address hidden>
Date: Wed Aug 14 10:30:41 2013 -0300

    Add job to propose tag merges

    With pbr tag-based versioning, not having the latest release tag in the
    master branch makes the output a little nasty. Add a job that makes a
    merge commit containing the tag on a release from milestone-proposed
    branch. The merge strategy it uses is 'ours' because we're not
    attempting to use this to keep code lines up to date - the expectation
    is that content added in milestone-proposed should already be in master.
    The main thing we want to do is re-connect the revision and tag history
    with master, so that things like 'git tag --contains' work.

    Closes-Bug: 1192039
    Change-Id: I06c06bd7542ae493e74fdcaa3c4419f84843cd03