Viewing all changes in revision 995.1.21.
- Committer: Martin Packman
- Date: 2015-08-18 15:01:56 UTC
- mfrom: (1064 trunk)
- mto: This revision was merged to the branch mainline in revision 1065.
- Revision ID: martin.packman@canonical.com-20150818150156-0lq5rejdpwgbhvha
Merge trunk to re-resolve conflicts in deploy_stack
- files added:
- run-client-server-test-remote.bash
- files renamed:
- test_upload_hetero_control.py => test_upload_jenkins_job.py
- upload_hetero_control.py => upload_jenkins_job.py
- files modified:
- assess_heterogeneous_control.py
expand all
collapse all
added
removed
