~cloud-init-dev/cloud-init/trunk

Viewing all changes in revision 1052.1.5.

  • Committer: Barry Warsaw
  • Date: 2015-01-21 22:56:53 UTC
  • mto: This revision was merged to the branch mainline in revision 1054.
  • Revision ID: barry@python.org-20150121225653-331tcuhwd1szidkh
Largely merge lp:~harlowja/cloud-init/py2-3 albeit manually because it seemed
to be behind trunk.

`tox -e py27` passes full test suite.  Now to work on replacing mocker.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: