← Back to branch summary

~andrewjbeach/juju-ci-tools/make-local-patcher

~andrewjbeach/juju-ci-tools/make-local-patcher

« back to all changes in this revision

Viewing changes to maas/maasprv1.xml

Committer: James Tunnicliffe
Date: 2015-11-13 16:27:48 UTC
mfrom: (1151 trunk)
mto: (1091.5.9 addressable-containers-assess)
mto: This revision was merged to the branch mainline in revision 1160.
Revision ID: james.tunnicliffe@canonical.com-20151113162748-1k3wwwvh3a4edjij

Merge trunk

files added:
assess_status_output.py

cs_staging_deploy.py

status.py

tests/test_assess_status_output.py

tests/test_cs_staging_deploy.py

files removed:
assess_autoload_credentials.py

assess_block.py

assess_constraints.py

assess_controller_permissions.py

assess_cs_staging.py

assess_log_forward.py

assess_min_version.py

assess_mixed_images.py

assess_model_config_tree.py

assess_model_migration.py

assess_multi_series_charms.py

assess_resources.py

assess_resources_charmstore.py

assess_spaces_subnets.py

assess_ssh_keys.py

assess_storage.py

assess_unregister.py

assess_update_mongo.py

assess_user_grant_revoke.py

certificates.py

clean_maas.py

concurrently.py

convert_config.py

example-collectd.conf

fakejuju.py

generate_perfscale_results.py

jujucharm.py

log_check.py

logbreakdown.py

maas

maas-p8

maas-p8/add-virtual-maas-nodes.bash

maas-p8/cloud-config.txt

maas-p8/maas-network.xml

maas-p8/maas-node-1.xml

maas-p8/maaspool1.xml

maas-p8/readme.txt

maas/add-virtual-maas-nodes.bash

maas/maas-node-1.xml

maas/maas-node-first-NIC-1.xml

maas/maasnet2.xml

maas/maaspool1.xml

maas/maasprv1.xml

maas/setup-virtual-maas.bash

mac-win-requirements.txt

obsolete-requirements.txt

perf_graphing.py

perf_report_template.html

perf_static

perf_static/collectd.conf

perf_static/setup-perf-monitoring.sh

rackspace-generate-image-streams.bash

run-maas-networking-remote.bash

run-maas-networking.bash

run-uitests.bash

scale_out.py

streams-from-local.bash

template_test.py.tmpl

tests/test_assess_autoload_credentials.py

tests/test_assess_block.py

tests/test_assess_constraints.py

tests/test_assess_controller_permissions.py

tests/test_assess_cs_staging.py

tests/test_assess_log_forward.py

tests/test_assess_min_version.py

tests/test_assess_mixed_images.py

tests/test_assess_model_config_tree.py

tests/test_assess_model_migration.py

tests/test_assess_multi_series_charms.py

tests/test_assess_resources.py

tests/test_assess_resources_charmstore.py

tests/test_assess_spaces_subnets.py

tests/test_assess_ssh_keys.py

tests/test_assess_storage.py

tests/test_assess_unregister.py

tests/test_assess_update_mongo.py

tests/test_assess_user_grant_revoke.py

tests/test_clean_resources.py

tests/test_concurrently.py

tests/test_generate_perfscale_results.py

tests/test_gotestwin.py

tests/test_jujucharm.py

tests/test_log_check.py

tests/test_logbreakdown.py

tests/test_perf_graphing.py

tests/test_scale_out.py

tests/test_verify_landscape_bundle.py

tests/test_verify_mediawiki_bundle.py

tests/test_winazurearm.py

verify_landscape_bundle.py

verify_mediawiki_bundle.py

winazurearm.py

files renamed:
tests/test_assess_container_networking.py => test_assess_container_networking.py

files modified:
.bzrignore

Makefile

README.md

assemble-parallel-streams.bash

assess_bootstrap.py

assess_container_networking.py

assess_heterogeneous_control.py

assess_jes_deploy.py

assess_log_rotation.py

assess_recovery.py

assess_win_client.py

bootstrap

candidate.py

chaos.py

check_blockers.py

clean_resources.py

cloud_deploy.py

deploy_stack.py

destroy-environment

dump_logs.py

get_ami.py

git_gate.py

gotesttarfile.py *

gotestwin.py

industrial_test.py

joyent.py

juju-ci-openstack-check.sh

juju-ci-tools-common

jujuci.py

jujuconfig.py

jujupy.py

make-buildvars

per-test-streams.bash

pipdeps.py

quickstart_deploy.py

remote.py

remove-manual-juju.bash

requirements.txt

run-client-server-test-remote.bash

run-client-server-test.bash

run-deploy-job.bash

run-osx-client-remote.bash

run-osx-client.bash

run-reliability-test.bash

run-unit-tests

run_chaos_monkey.py

run_deployer.py

run_download_juju.py

s3ci.py

schedule_chaos_tests.py

schedule_hetero_control.py

schedule_reliability_tests.py

setup-slave.bash

substrate.py

template_assess.py.tmpl

test-restricted-network

tests/__init__.py

tests/test_assess_bootstrap.py

tests/test_assess_heterogeneous_control.py

tests/test_assess_jes_deploy.py

tests/test_assess_log_rotation.py

tests/test_assess_recovery.py

tests/test_candidate.py

tests/test_chaos.py

tests/test_check_blockers.py

tests/test_deploy_stack.py

tests/test_get_ami.py

tests/test_git_gate.py

tests/test_gotesttarfile.py

tests/test_industrial_test.py

tests/test_joyent.py

tests/test_jujuci.py

tests/test_jujuconfig.py

tests/test_jujupy.py

tests/test_pipdeps.py

tests/test_quickstart_deploy.py

tests/test_remote.py

tests/test_run_chaos_monkey.py

tests/test_run_deployer.py

tests/test_run_download_juju.py

tests/test_s3ci.py

tests/test_schedule_chaos_tests.py

tests/test_schedule_hetero_control.py

tests/test_schedule_reliability_tests.py

tests/test_substrate.py

tests/test_timeout.py

tests/test_upload_jenkins_job.py

tests/test_utility.py

update-jenkins-branches.bash

upload_jenkins_job.py

utility.py

Show diffs side-by-side

added added

removed removed

maas/maasprv1.xml

1

<network>

2

<name>maasprv1</name>

3

<bridge name='maasprvbr1'/>

4

</network>

Older »