Merge lp://staging/~smoser/simplestreams/trunk.moved-to-git into lp://staging/simplestreams
Proposed by
Scott Moser
| Status: | Merged |
|---|---|
| Merged at revision: | 462 |
| Proposed branch: | lp://staging/~smoser/simplestreams/trunk.moved-to-git |
| Merge into: | lp://staging/simplestreams |
| Diff against target: |
12175 lines (+3/-11608) 105 files modified
LICENSE (+0/-661) Makefile (+0/-41) README.txt (+1/-1) bin/json2streams (+0/-9) bin/sstream-mirror (+0/-159) bin/sstream-query (+0/-150) bin/sstream-sync (+0/-171) debian/changelog.trunk (+0/-6) debian/compat (+0/-1) debian/control (+0/-70) debian/copyright (+0/-17) debian/python-simplestreams.install (+0/-1) debian/python3-simplestreams.install (+0/-1) debian/rules (+0/-19) debian/simplestreams.install (+0/-2) debian/source/format (+0/-1) doc/README (+0/-161) doc/files/my.cfg (+0/-25) doc/files/openstack-sync.cfg (+0/-51) examples/cirros/streams/v1/index.json (+0/-28) examples/cirros/streams/v1/net.cirros-cloud:devel:download.json (+0/-311) examples/cirros/streams/v1/net.cirros-cloud:released:download.json (+0/-216) examples/foocloud/files/beta-2/foovendor-6.1-beta2-server-cloudimg-amd64-disk1.img (+0/-1) examples/foocloud/files/beta-2/foovendor-6.1-beta2-server-cloudimg-amd64-root.tar.gz (+0/-1) examples/foocloud/files/beta-2/foovendor-6.1-beta2-server-cloudimg-amd64.tar.gz (+0/-1) examples/foocloud/files/beta-2/foovendor-6.1-beta2-server-cloudimg-i386-disk1.img (+0/-1) examples/foocloud/files/beta-2/foovendor-6.1-beta2-server-cloudimg-i386-root.tar.gz (+0/-1) examples/foocloud/files/beta-2/foovendor-6.1-beta2-server-cloudimg-i386.tar.gz (+0/-1) examples/foocloud/files/release-20121001/foovendor-6.1-server-cloudimg-amd64-disk1.img (+0/-1) examples/foocloud/files/release-20121001/foovendor-6.1-server-cloudimg-amd64-root.tar.gz (+0/-1) examples/foocloud/files/release-20121001/foovendor-6.1-server-cloudimg-amd64.tar.gz (+0/-1) examples/foocloud/files/release-20121001/foovendor-6.1-server-cloudimg-i386-disk1.img (+0/-1) examples/foocloud/files/release-20121001/foovendor-6.1-server-cloudimg-i386-root.tar.gz (+0/-1) examples/foocloud/files/release-20121001/foovendor-6.1-server-cloudimg-i386.tar.gz (+0/-1) examples/foocloud/files/release-20121026.1/foovendor-6.1-server-cloudimg-amd64-disk1.img (+0/-1) examples/foocloud/files/release-20121026.1/foovendor-6.1-server-cloudimg-amd64-root.tar.gz (+0/-1) examples/foocloud/files/release-20121026.1/foovendor-6.1-server-cloudimg-amd64.tar.gz (+0/-1) examples/foocloud/files/release-20121026.1/foovendor-6.1-server-cloudimg-i386-disk1.img (+0/-1) examples/foocloud/files/release-20121026.1/foovendor-6.1-server-cloudimg-i386-root.tar.gz (+0/-1) examples/foocloud/files/release-20121026.1/foovendor-6.1-server-cloudimg-i386.tar.gz (+0/-1) examples/foocloud/streams/v1/com.example.foovendor:released:aws.json (+0/-122) examples/foocloud/streams/v1/com.example.foovendor:released:download.json (+0/-208) examples/foocloud/streams/v1/index.json (+0/-26) examples/keys/README.txt (+0/-21) examples/keys/cirros.pub (+0/-86) examples/keys/cloud-images.pub (+0/-53) examples/keys/example.pub (+0/-14) examples/keys/example.sec (+0/-21) examples/minimal/product1/20150915/root.img (+0/-1) examples/minimal/product1/20150915/text.txt (+0/-1) examples/minimal/streams/v1/download.json (+0/-28) examples/minimal/streams/v1/index.json (+0/-15) setup.py (+0/-28) simplestreams/__init__.py (+2/-8) simplestreams/checksum_util.py (+0/-110) simplestreams/contentsource.py (+0/-472) simplestreams/filters.py (+0/-76) simplestreams/generate_simplestreams.py (+0/-110) simplestreams/json2streams.py (+0/-110) simplestreams/log.py (+0/-68) simplestreams/mirrors/__init__.py (+0/-585) simplestreams/mirrors/command_hook.py (+0/-302) simplestreams/mirrors/glance.py (+0/-641) simplestreams/objectstores/__init__.py (+0/-229) simplestreams/objectstores/s3.py (+0/-101) simplestreams/objectstores/swift.py (+0/-153) simplestreams/openstack.py (+0/-206) simplestreams/util.py (+0/-613) tests/__init__.py (+0/-1) tests/httpserver.py (+0/-52) tests/testutil.py (+0/-23) tests/unittests/test_badmirrors.py (+0/-138) tests/unittests/test_command_hook_mirror.py (+0/-63) tests/unittests/test_contentsource.py (+0/-381) tests/unittests/test_generate_simplestreams.py (+0/-266) tests/unittests/test_glancemirror.py (+0/-657) tests/unittests/test_json2streams.py (+0/-211) tests/unittests/test_mirrorreaders.py (+0/-116) tests/unittests/test_mirrorwriters.py (+0/-28) tests/unittests/test_resolvework.py (+0/-117) tests/unittests/test_signed_data.py (+0/-43) tests/unittests/test_util.py (+0/-239) tests/unittests/tests_filestore.py (+0/-65) tools/build-deb (+0/-80) tools/compare-test-data (+0/-101) tools/create-gpgdir (+0/-55) tools/export-tarball (+0/-61) tools/gen-example-key (+0/-75) tools/gpg-trust-pubkey (+0/-32) tools/hook-check-downloads (+0/-121) tools/hook-debug (+0/-59) tools/hook-glance (+0/-198) tools/hook-image-id (+0/-152) tools/install-deps (+0/-106) tools/js2signed (+0/-53) tools/make-test-data (+0/-710) tools/run-flake8 (+0/-39) tools/sign-examples (+0/-9) tools/sign_helper.py (+0/-35) tools/sstream-mirror-glance (+0/-180) tools/tab2streams (+0/-91) tools/tenv (+0/-21) tools/toolutil.py (+0/-253) tools/ubuntu_versions.py (+0/-203) tox.ini (+0/-46) |
| To merge this branch: | bzr merge lp://staging/~smoser/simplestreams/trunk.moved-to-git |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| David Ames (community) | Approve | ||
| Corey Bryant (community) | Approve | ||
| simplestreams-dev | Pending | ||
|
Review via email:
|
|||
Commit message
Development has been moved to git.
Simplestreams has moved its development from bzr to git.
If you are seeing this message, it means you have checked out via bzr.
Please update your workflow to use git. Instead of
bzr branch lp:simplestreams
use:
git clone https:/
Description of the change
*************** DO NOT LAND BEFORE 2018-08-21 *******************
We currently have a warning being printed in the bzr source code that
mentions it will stay useful until 2018-07-31.
So do not merge this until after 2018-08-21.
Reality is that no one will see the warning, but will hopefully
see the failure. They can respond to the failure by
a.) immediately putting 'SIMPLESTREAMS_
b.) moving to git as directed.
After 3 weeks of that, then we will pull the plug entirely.
To post a comment you must log in.
Revision history for this message
| Corey Bryant (corey.bryant) wrote | # |
Revision history for this message
| Corey Bryant (corey.bryant) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
I ran this by the team today and we're +1 on it. The glance-