← Back to branch summary

~lamont/maas-images/add-my-ppa

~lamont/maas-images/add-my-ppa

Viewing all changes in revision 337.

Committer: LaMont Jones
Date: 2016-10-05 21:01:13 UTC
mfrom: (329.1.11 trunk.proposed-squashfs)
Revision ID: lamont@canonical.com-20161005210113-r8gf9od4pxm64xyf

merge smoser branch

files added:
bin/meph2-import

meph2/commands/flags.py

meph2/commands/mimport.py

files modified:
bin/maas-cloudimg2eph2

bin/maas-cloudimg2ephemeral

conf/meph-v3.yaml

meph2/commands/build_image.py

meph2/commands/cloudimg_sync.py

meph2/commands/meph2_util.py

meph2/stream.py

meph2/util.py

Show diffs side-by-side

added added

removed removed

bin/maas-cloudimg2eph2

bin/maas-cloudimg2ephemeral

bin/meph2-import

conf/meph-v3.yaml

meph2/commands/build_image.py

meph2/commands/cloudimg_sync.py

meph2/commands/flags.py

meph2/commands/meph2_util.py

meph2/commands/mimport.py

meph2/stream.py

Older »