← Back to branch summary

~viswesn/juju-ci-tools/aws_boto3

~viswesn/juju-ci-tools/aws_boto3

Viewing all changes in revision 1686.1.3.

Committer: Christopher Lee
Date: 2016-10-26 04:59:52 UTC
mfrom: (1689 trunk)
mto: This revision was merged to the branch mainline in revision 1698.
Revision ID: chris.lee@canonical.com-20161026045952-g0l8ba05nmo5a638

Merge trunk. Fix conflict issues.

files added:
perfscale_longrunning.py

tests/test_perfscale_longrunning.py

files modified:
deploy_stack.py

example-collectd.conf

generate_perfscale_results.py

jujupy.py

perf_graphing.py

tests/test_generate_perfscale_results.py

tests/test_jujupy.py

Show diffs side-by-side

added added

removed removed

deploy_stack.py

example-collectd.conf

generate_perfscale_results.py

perf_graphing.py

perfscale_longrunning.py

tests/test_generate_perfscale_results.py

tests/test_jujupy.py

tests/test_perfscale_longrunning.py

Older »