Merge lp://staging/~james-page/charms/trusty/swift-storage/xenial into lp://staging/~openstack-charmers-archive/charms/trusty/swift-storage/trunk
Proposed by
James Page
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~james-page/charms/trusty/swift-storage/xenial |
| Merge into: | lp://staging/~openstack-charmers-archive/charms/trusty/swift-storage/trunk |
| Diff against target: |
13142 lines (+12701/-18) (has conflicts) 59 files modified
.testr.conf (+8/-0) actions.yaml (+6/-0) actions/actions.py (+108/-0) actions/openstack_upgrade.py (+34/-0) charm-helpers-hooks.yaml (+5/-0) charmhelpers.new/cli/__init__.py (+191/-0) charmhelpers.new/cli/benchmark.py (+36/-0) charmhelpers.new/cli/commands.py (+32/-0) charmhelpers.new/cli/hookenv.py (+23/-0) charmhelpers.new/cli/host.py (+31/-0) charmhelpers.new/cli/unitdata.py (+39/-0) charmhelpers.new/contrib/charmsupport/nrpe.py (+398/-0) charmhelpers.new/contrib/hahelpers/cluster.py (+316/-0) charmhelpers.new/contrib/network/ip.py (+458/-0) charmhelpers.new/contrib/openstack/amulet/deployment.py (+302/-0) charmhelpers.new/contrib/openstack/amulet/utils.py (+985/-0) charmhelpers.new/contrib/openstack/context.py (+1477/-0) charmhelpers.new/contrib/openstack/files/check_haproxy.sh (+34/-0) charmhelpers.new/contrib/openstack/ip.py (+151/-0) charmhelpers.new/contrib/openstack/neutron.py (+378/-0) charmhelpers.new/contrib/openstack/templates/ceph.conf (+21/-0) charmhelpers.new/contrib/openstack/templates/haproxy.cfg (+66/-0) charmhelpers.new/contrib/openstack/templating.py (+323/-0) charmhelpers.new/contrib/openstack/utils.py (+1044/-0) charmhelpers.new/contrib/python/packages.py (+130/-0) charmhelpers.new/contrib/storage/linux/ceph.py (+1039/-0) charmhelpers.new/contrib/storage/linux/loopback.py (+88/-0) charmhelpers.new/contrib/storage/linux/utils.py (+71/-0) charmhelpers.new/core/files.py (+45/-0) charmhelpers.new/core/hookenv.py (+978/-0) charmhelpers.new/core/host.py (+673/-0) charmhelpers.new/core/hugepage.py (+71/-0) charmhelpers.new/core/kernel.py (+68/-0) charmhelpers.new/core/services/base.py (+353/-0) charmhelpers.new/core/services/helpers.py (+292/-0) charmhelpers.new/core/strutils.py (+72/-0) charmhelpers.new/core/templating.py (+81/-0) charmhelpers.new/core/unitdata.py (+521/-0) charmhelpers.new/fetch/__init__.py (+464/-0) charmhelpers.new/fetch/archiveurl.py (+167/-0) charmhelpers.new/fetch/bzrurl.py (+68/-0) charmhelpers.new/fetch/giturl.py (+70/-0) lib/misc_utils.py (+110/-0) lib/swift_storage_context.py (+96/-0) lib/swift_storage_utils.py (+372/-0) requirements.txt (+11/-0) test-requirements.txt (+8/-0) tests/018-basic-trusty-liberty (+11/-0) tests/019-basic-trusty-mitaka (+11/-0) tests/019-basic-vivid-kilo (+0/-9) tests/020-basic-wily-liberty (+9/-0) tests/021-basic-xenial-mitaka (+9/-0) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+9/-0) tests/tests.yaml (+21/-0) tox.ini (+29/-0) unit_tests/test_actions.py (+220/-0) unit_tests/test_actions_openstack_upgrade.py (+58/-0) unit_tests/test_swift_storage_context.py (+1/-5) unit_tests/test_swift_storage_utils.py (+9/-4) Conflict adding file .testr.conf. Moved existing file to .testr.conf.moved. Path conflict: <deleted> / lib/misc_utils.py Path conflict: <deleted> / lib/swift_storage_context.py Path conflict: <deleted> / lib/swift_storage_utils.py Conflict adding file actions. Moved existing file to actions.moved. Conflict adding file actions.yaml. Moved existing file to actions.yaml.moved. Text conflict in charm-helpers-hooks.yaml Conflict adding file charmhelpers. Moved existing file to charmhelpers.moved. Conflict: charmhelpers.new is not a directory, but has files in it. Created directory. Conflict adding files to charmhelpers.new/contrib. Created directory. Conflict because charmhelpers.new/contrib is not versioned, but has versioned children. Versioned directory. Conflict adding files to charmhelpers.new/contrib/charmsupport. Created directory. Conflict because charmhelpers.new/contrib/charmsupport is not versioned, but has versioned children. Versioned directory. Conflict adding files to charmhelpers.new/contrib/hahelpers. Created directory. Conflict because charmhelpers.new/contrib/hahelpers is not versioned, but has versioned children. Versioned directory. Conflict adding files to charmhelpers.new/contrib/network. Created directory. Conflict because charmhelpers.new/contrib/network is not versioned, but has versioned children. Versioned directory. Conflict adding files to charmhelpers.new/contrib/openstack. Created directory. Conflict because charmhelpers.new/contrib/openstack is not versioned, but has versioned children. Versioned directory. Conflict adding files to charmhelpers.new/contrib/openstack/amulet. Created directory. Conflict because charmhelpers.new/contrib/openstack/amulet is not versioned, but has versioned children. Versioned directory. Conflict adding files to charmhelpers.new/contrib/openstack/files. Created directory. Conflict because charmhelpers.new/contrib/openstack/files is not versioned, but has versioned children. Versioned directory. Conflict adding files to charmhelpers.new/contrib/openstack/templates. Created directory. Conflict because charmhelpers.new/contrib/openstack/templates is not versioned, but has versioned children. Versioned directory. Conflict adding files to charmhelpers.new/contrib/python. Created directory. Conflict because charmhelpers.new/contrib/python is not versioned, but has versioned children. Versioned directory. Conflict adding files to charmhelpers.new/contrib/storage. Created directory. Conflict because charmhelpers.new/contrib/storage is not versioned, but has versioned children. Versioned directory. Conflict adding files to charmhelpers.new/contrib/storage/linux. Created directory. Conflict because charmhelpers.new/contrib/storage/linux is not versioned, but has versioned children. Versioned directory. Conflict adding files to charmhelpers.new/core. Created directory. Conflict because charmhelpers.new/core is not versioned, but has versioned children. Versioned directory. Conflict adding files to charmhelpers.new/core/services. Created directory. Conflict because charmhelpers.new/core/services is not versioned, but has versioned children. Versioned directory. Conflict adding files to charmhelpers.new/fetch. Created directory. Conflict because charmhelpers.new/fetch is not versioned, but has versioned children. Versioned directory. Conflict adding file hooks/install.real. Moved existing file to hooks/install.real.moved. Conflict adding file hooks/lib. Moved existing file to hooks/lib.moved. Conflict adding file lib. Moved existing file to lib.moved. Conflict adding file requirements.txt. Moved existing file to requirements.txt.moved. Conflict adding file test-requirements.txt. Moved existing file to test-requirements.txt.moved. Conflict adding file tests/018-basic-trusty-liberty. Moved existing file to tests/018-basic-trusty-liberty.moved. Conflict adding file tests/019-basic-trusty-mitaka. Moved existing file to tests/019-basic-trusty-mitaka.moved. Conflict adding file tests/020-basic-wily-liberty. Moved existing file to tests/020-basic-wily-liberty.moved. Conflict adding file tests/021-basic-xenial-mitaka. Moved existing file to tests/021-basic-xenial-mitaka.moved. Text conflict in tests/charmhelpers/contrib/openstack/amulet/deployment.py Conflict adding file tests/setup. Moved existing file to tests/setup.moved. Conflict adding file tests/tests.yaml. Moved existing file to tests/tests.yaml.moved. Conflict adding file tox.ini. Moved existing file to tox.ini.moved. Conflict adding file unit_tests/test_actions.py. Moved existing file to unit_tests/test_actions.py.moved. Conflict adding file unit_tests/test_actions_openstack_upgrade.py. Moved existing file to unit_tests/test_actions_openstack_upgrade.py.moved. |
| To merge this branch: | bzr merge lp://staging/~james-page/charms/trusty/swift-storage/xenial |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenStack Charmers | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2016-01-30.
Description of the change
Resync helpers, fixup xenial support.
To post a comment you must log in.
Unmerged revisions
- 106. By James Page
-
Enable xenial mitaka tests
- 105. By James Page
-
Baseline
- 104. By James Page
-
Tidy lint
- 103. By James Page
-
Resync helpers, refactor code to use cpu calcs from charmhelpers
- 102. By James Page
-
Fix liberty/mitaka typo from previous test definition update batch.
- 101. By Corey Bryant
-
[corey.bryant, r=jamespage] Sync charm-helpers.
- 100. By Liam Young
-
Update test combo definitions, remove Vivid deprecated release tests, update bundletester testplan yaml, update tests README.
- 99. By Liam Young
-
[corey.bryant, r=gnuoy] Charmhelper sync
- 98. By James Page
-
Resync helpers
- 97. By Corey Bryant
-
[corey.
bryant, r=trivial] Sync charm-helpers.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
