Proxy config fixup for bad merge. #337
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
test this please |
| @@ -627,9 +660,6 @@ def InstallPackages(self, packages): | |||
|
|
|||
| def Install(self, package_name): | |||
| """Installs a PerfKit package on the VM.""" | |||
| if ((self.is_static and not self.install_packages) or | |||
There was a problem hiding this comment.
I don't think we want to delete these lines
There was a problem hiding this comment.
Oops, not sure what happened here. Fixed.
|
2 small comments - otherwise LGTM |
Closed
The previous proxy config patch erroneously applied changes to the deleted file package_managers.py, reviving it in the process. Delete it again, and apply its changes to linux_virtual_machine.py.
2da9cf2 to
b8e2771
Compare
|
test this please. |
1 similar comment
|
test this please. |
klausw
added a commit
that referenced
this pull request
Jun 23, 2015
Proxy config fixup for bad merge.
klausw
added a commit
that referenced
this pull request
Jul 9, 2015
Release 0.18.0. (See also #369 which includes this change log with clickable GH-* links.) * New features: * Support OpenStack as cloud provider (GH-305, GH-353, thanks @kivio and @mateusz-blaszkowski) * Support Rackspace as cloud provider (GH-336, thanks @meteorfox and @jrperritt) * Add support for ContainerizedVM using docker exec (GH-333, thanks @gablg1) * Windows guest VM support on Static VM (GH-350), Azure (GH-349, GH-374), AWS (GH-347), and GCE (GH-338) * Add NTttcp Windows networking benchmark (GH-348) * Enhancements: * Support using proxies in VMs (GH-339, GH-337, thanks @kivio) * Enable optional migration on GCE (GH-343) * Execute long running commands via a remote agent (GH-310) * Add resource creation/deletion times to logs (GH-316) * Bugfixes and maintenance updates: * Update PKB to work with Azure version 0.9.3 (GH-312) * Fix AWS CLI usage on Windows host (GH-313) * Auto-fetch AMI IDs for AWS images (GH-364) * Fix publisher missing info for default image and machine type (GH-357) * Fix 'no attribute pkb_thread_log_context' error for sub-thread logs (GH-322) * Benchmark-specific changes: * aerospike: config/flag handling bugfixes (GH-367, GH-360, GH-354) * cassandra_ycsb: move num_vms prerequisite check * fio: add latency percentiles for results (GH-344) * hadoop_terasort: Fix bad SSH option (GH-328) * iperf: add lower bounds to arguments (GH-314) * iperf: add timeout to parallel benchmark runs to handle iperf hangs (GH-375) * netperf: Support confidence intervals, increase test length, report stddev (GH-317, GH-306) * ycsb: Drop unaggregatable results from samples (GH-324) * Development and testing: * **Breaking Change** Automated testing now uses `tox` (GH-330) * Refactored hook scripts, including new opt-in pre-push hook (GH-363) * Use travis for CI testing (GH-340) * Speed up tests using timeouts (GH-299) * Internals: * Move defaults from benchmark_spec to VM classes, move network instantiation out of benchmark spec (GH-342) * Add event hook support (GH-315) * Refactor VM classes (GH-321)
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The previous proxy config patch erroneously applied changes to the deleted
file package_managers.py, reviving it in the process. Delete it again, and
apply its changes to linux_virtual_machine.py.