[Pkg-puppet-devel] SECURITY: Authorization vulnerability in Puppet 2.6.x

[Stig Sandbeck Mathisen]

Nigel Kersten <nigel at explanatorygap.net> writes:

> Yes. I'm going to merge that now. I've been away too long and have
> forgotten what all our branches are for :(

There are a few of them, true. :P  Here's a list

Need to have
============

* upstream - upstream

* master - upstream branch + ./debian/

* squeeze-2.6.2 - the branch used for packaging puppet 2.6.2 to debian
  squeeze.  Should probably be renamed to "squeeze".

* maverick, natty - the branches used for the ubuntu

Nice to have
============

* pristine-tar - used for storing the release tarballs in some strange
  way.  Nice-to-have, and not need-to-have.

Not in use
==========

* upstream-patches - should probably have been used for patches
  backported from upstream, and pushed to master.  Not in use, I think.

* squeeze, squeeze-2.6.1 - the previous squeeze branches for 2.6.1 and
  2.6.0 (?), not in use, and you can safely ignore them, and remove from
  your local repo.  

  The reason for the versioned squeeze branches was the freeze, and was
  used for packaging different versions we might not have been able to
  push to testing.

* experimental - used for trying out the new packaging scheme.  Not in
  use.

* master0.24x - old master branch ?

* refactor - used for trying out a packaging scheme.

Unsure
======

* build - no clue what this is for.  Possibly before git-buildpackage

* debian - no clue what this is for.  Possibly before git-buildpackage

-- 
Stig Sandbeck Mathisen
                      ooo, shiny!