~harlowja/cloud-init:conflicts-and-a-name

Last commit made on 2016-08-09
Get this branch:
git clone -b conflicts-and-a-name https://git.launchpad.net/~harlowja/cloud-init
Only Joshua Harlow can upload to this branch. If you are Joshua Harlow please log in for upload directions.

Branch merges

Branch information

Name:
conflicts-and-a-name
Repository:
lp:~harlowja/cloud-init

Recent commits

c374ec4... by Joshua Harlow on 2016-08-09

Allow for providing a alternate (rpm) package name and package conflicts

b56d7a1... by Joshua Harlow on 2016-08-08

Newer requests have strong type validation

Only use strings in headers, as newer requests
actually do stricter validation of this, so ensure
that we comply by only having string objects in
header dicts.

48ec60a... by Scott Moser on 2016-08-08

For upstream snapshot versions do not modify git-describe output.

For upstream version directly use the output of git-describe
(X.Y.Z-number.gHASH) rather than rather than changing it to
(X.Y.Z+number.gHASH).

The rpm version does not allow '-' in Version, so we create and use
rpm_upstream_version in the rpm spec file. That is of format:
X.Y.Z+number.gHASH

d0b2863... by Scott Moser on 2016-08-05

adjust signal_handler for version changes.

signal_handler was still using vr.version().

78ec0f0... by Scott Moser on 2016-08-05

revert unintended change to ubuntu sources list

templates/sources.list.ubuntu.tmpl was inadvertantely
changed in a previous commit. Simply revert to older version.

42bed11... by Scott Moser on 2016-08-05

drop modification of version during make-tarball, tools changes.

Modification of the tarball became problematic, as it meant that
any tool extracting source would find the orig source tarball different.
I found this unusable when trying to use 'gbp buildpackage'.

Other changes here are to better support using python3 or python2
for the build. Makefile will try to call the right python version
and can be told which python to use.

read-version: by adding 'tiny_p' and avoiding the import of
cloudinit.util, we need less dependencies to run this.

10f82bd... by Scott Moser on 2016-08-05

adjust tools and version information.

upstream snapshots are versioned in the format 'X.Y.Z+<distance>.g<commit>'
where X.Y.Z are major, minor, and micro. Distance is number of commits
since last annotated tag, and commit is the git commit.

bddeb and brpm will now create and use the "upstream version" like above.

Things changed here:
 - tools/make-tarball
   update cloudinit/version.py to contain the full version
   support --output
   support '--long' to always create the long format version string.

 - bddeb:
   - use quilt debian source format
   - use read-version and long version in changelog.

 - brpm:
   - change to use read-version and upstream long version in the spec.
   - flake8 changes

 - tools/read-version
   - read version from git or from cloudinit/version.
   - provide --json output with more nicely formed data.

72d6adc... by Lars Kellogg-Stedman on 2016-07-22

Update build tools to work with git

- Update HACKING.rst to include git instructions
- update MANIFEST.in and .gitignore to ignore git-related things
- replaced tarball generation scripts with git-based script
- have the spec files correctly identify themselves as cheetah templates
- make brpm work with git

eed7fcc... by Scott Moser on 2016-07-29

fix pep8 errors in mcollective unit tests

Just fix the pep8 errors added in previous commit.

4264783... by Scott Moser on 2016-07-19

mcollective: add tests, cleanups and bug fix when no config in /etc.

Things here:
 - restart rather than 'start' the service, to pick up a config change
   that we would have written.
 - update the config and write cert files whether or not the file
   existed on the system. Previously it would only write the cert
   files if /etc/mcollective/server.cfg already existed.
 - improve test coverage