Merge lp://staging/~barry/ubuntu-system-image/citrain-2.1 into lp://staging/~ubuntu-managed-branches/ubuntu-system-image/system-image
| Status: | Merged | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 229 | ||||||||||||||||
| Proposed branch: | lp://staging/~barry/ubuntu-system-image/citrain-2.1 | ||||||||||||||||
| Merge into: | lp://staging/~ubuntu-managed-branches/ubuntu-system-image/system-image | ||||||||||||||||
| Diff against target: |
2123 lines (+901/-146) 65 files modified
MANIFEST.in (+1/-0) NEWS.rst (+48/-1) PKG-INFO (+1/-1) cli-manpage.rst (+1/-1) dbus-manpage.rst (+1/-1) debian/changelog (+32/-0) debian/control (+5/-4) debian/patches/01_send_ack_on_applyupdate.diff (+0/-16) debian/patches/lp1284217.patch (+106/-0) debian/patches/series (+1/-1) debian/rules (+1/-0) ini-manpage.rst (+1/-1) setup.cfg (+2/-2) setup.py (+1/-1) system_image.egg-info/PKG-INFO (+1/-1) system_image.egg-info/SOURCES.txt (+1/-1) systemimage/api.py (+5/-1) systemimage/bag.py (+1/-1) systemimage/bindings.py (+1/-1) systemimage/candidates.py (+1/-1) systemimage/channel.py (+1/-1) systemimage/config.py (+1/-1) systemimage/dbus.py (+51/-16) systemimage/device.py (+1/-1) systemimage/docs/conf.py (+1/-1) systemimage/download.py (+36/-2) systemimage/gpg.py (+95/-1) systemimage/helpers.py (+1/-1) systemimage/image.py (+1/-1) systemimage/index.py (+1/-1) systemimage/keyring.py (+3/-4) systemimage/logging.py (+29/-8) systemimage/main.py (+1/-1) systemimage/reactor.py (+1/-1) systemimage/reboot.py (+1/-1) systemimage/scores.py (+1/-1) systemimage/service.py (+14/-6) systemimage/settings.py (+1/-1) systemimage/state.py (+8/-10) systemimage/testing/controller.py (+17/-8) systemimage/testing/dbus.py (+8/-2) systemimage/testing/demo.py (+1/-1) systemimage/testing/helpers.py (+25/-7) systemimage/testing/nose.py (+21/-2) systemimage/tests/data/config_03.ini (+1/-1) systemimage/tests/data/index_24.json (+36/-0) systemimage/tests/test_api.py (+1/-1) systemimage/tests/test_bag.py (+1/-1) systemimage/tests/test_candidates.py (+1/-1) systemimage/tests/test_channel.py (+1/-1) systemimage/tests/test_config.py (+1/-1) systemimage/tests/test_dbus.py (+98/-8) systemimage/tests/test_download.py (+1/-1) systemimage/tests/test_gpg.py (+175/-2) systemimage/tests/test_helpers.py (+1/-1) systemimage/tests/test_image.py (+1/-1) systemimage/tests/test_index.py (+1/-1) systemimage/tests/test_keyring.py (+20/-5) systemimage/tests/test_main.py (+25/-1) systemimage/tests/test_scores.py (+1/-1) systemimage/tests/test_settings.py (+1/-1) systemimage/tests/test_state.py (+1/-1) systemimage/tests/test_winner.py (+1/-1) systemimage/version.txt (+1/-1) tox.ini (+1/-1) |
||||||||||||||||
| To merge this branch: | bzr merge lp://staging/~barry/ubuntu-system-image/citrain-2.1 | ||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Stéphane Graber | Pending | ||
|
Review via email:
|
|||
Commit message
New upstream release, along with some packaging changes. See changelog and NEWS.rst for details.
Description of the change
[ Stéphane Graber ]
* New upstream release.
* Set X-Auto-Uploader to no-rewrite-version
* Set Vcs-Bzr to the new target branch
[ Barry Warsaw ]
* New upstream release.
- LP: #1279056 - Internal improvements to SignatureError for
better debugging.
- LP: #1277589 - Better protection against race conditions.
- LP: #1260768 - Return empty string from ApplyUpdate D-Bus method.
- Request ubuntu-
with atomic rename.
- More detailed logging.
- Fixed D-Bus error logging.
- Added -L flag to nose2 tests for explicitly setting log file path.
- Added SYSTEMIMAGE_
which can be used to give virtualized buildds a fighting chance.
* d/patches/
* d/control: Bump Standards-Version to 3.9.5 with no other changes necessary.
