Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(37)

Issues Search
    My Issues | Starred     Open | Closed | All

Issue 6124004: Revert "Merge remote branch 'cros/upstream' into autotest-rebase" (Closed)

Created:
9 years, 11 months ago by Kenneth Waters
Modified:
9 years, 7 months ago
Reviewers:
ericli, DaleCurtis, robotboy
CC:
chromium-os-reviews_chromium.org, truty+cc_chromium.org, sosa+cc_chromium.org, seano+cc_chromium.org, ericli, petkov+cc_chromium.org
Visibility:
Public.

Description

Revert "Merge remote branch 'cros/upstream' into autotest-rebase" This reverts commit 7edb30498d75a29a3287fe07070f2b51a116c5d4. TEST=Built for tegra2_seaboard BUG=10756 Committed: http://chrome-svn/viewvc/chromeos?view=rev&revision=bdaab79

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+4691 lines, -9727 lines) Patch
M .gitignore View 1 chunk +0 lines, -3 lines 0 comments Download
M cli/atest View 1 chunk +2 lines, -1 line 0 comments Download
M cli/job.py View 1 chunk +0 lines, -6 lines 0 comments Download
M client/bin/kernel.py View 1 chunk +6 lines, -8 lines 0 comments Download
M client/bin/kernel_unittest.py View 1 chunk +4 lines, -8 lines 0 comments Download
M client/bin/partition.py View 1 chunk +1 line, -1 line 0 comments Download
M client/common_lib/base_barrier.py View 3 chunks +13 lines, -12 lines 0 comments Download
M client/common_lib/base_barrier_unittest.py View 2 chunks +6 lines, -5 lines 0 comments Download
M client/common_lib/base_job.py View 4 chunks +6 lines, -7 lines 0 comments Download
D client/common_lib/base_utils.py View 1 chunk +0 lines, -1715 lines 0 comments Download
D client/common_lib/base_utils_unittest.py View 1 chunk +0 lines, -799 lines 0 comments Download
M client/common_lib/control_data.py View 2 chunks +0 lines, -2 lines 0 comments Download
M client/common_lib/logging_manager.py View 1 chunk +1 line, -1 line 0 comments Download
A client/common_lib/magic.py View 0 chunks +-1 lines, --1 lines 0 comments Download
D client/common_lib/software_manager.py View 1 chunk +0 lines, -788 lines 0 comments Download
M client/common_lib/utils.py View 1 chunk +1712 lines, -10 lines 0 comments Download
M client/profilers/cpistat/cpistat.py View 1 chunk +1 line, -1 line 0 comments Download
A client/samples/filesystem View 1 chunk +25 lines, -0 lines 0 comments Download
M client/tests/hackbench/hackbench.py View 1 chunk +2 lines, -2 lines 0 comments Download
A client/tests/iozone/iozone.py View 0 chunks +-1 lines, --1 lines 0 comments Download
M client/tests/kvm/build.cfg.sample View 3 chunks +7 lines, -22 lines 0 comments Download
A client/tests/kvm/deps/finish.exe View Binary file 0 comments Download
A client/tests/kvm/deps/rss.exe View Binary file 0 comments Download
D client/tests/kvm/deps/test_clock_getres/Makefile View 1 chunk +0 lines, -11 lines 0 comments Download
D client/tests/kvm/deps/test_clock_getres/test_clock_getres.c View 1 chunk +0 lines, -58 lines 0 comments Download
A client/tests/kvm/deps/whql_delete_machine_15.exe View Binary file 0 comments Download
M client/tests/kvm/deps/whql_submission_15.cs View 6 chunks +145 lines, -229 lines 0 comments Download
client/tests/kvm/deps/whql_submission_15.exe View 0 chunks +-1 lines, --1 lines 0 comments Download
M client/tests/kvm/get_started.py View 1 chunk +3 lines, -3 lines 0 comments Download
D client/tests/kvm/installer.py View 1 chunk +0 lines, -781 lines 0 comments Download
M client/tests/kvm/kvm.py View 5 chunks +9 lines, -10 lines 0 comments Download
M client/tests/kvm/kvm_preprocessing.py View 11 chunks +20 lines, -30 lines 0 comments Download
M client/tests/kvm/kvm_scheduler.py View 1 chunk +3 lines, -3 lines 0 comments Download
M client/tests/kvm/kvm_subprocess.py View 22 chunks +139 lines, -276 lines 0 comments Download
M client/tests/kvm/kvm_test_utils.py View 18 chunks +84 lines, -128 lines 0 comments Download
M client/tests/kvm/kvm_utils.py View 14 chunks +176 lines, -401 lines 0 comments Download
M client/tests/kvm/kvm_vm.py View 33 chunks +153 lines, -164 lines 0 comments Download
D client/tests/kvm/migration_control.srv View 1 chunk +0 lines, -122 lines 0 comments Download
M client/tests/kvm/scan_results.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/kvm/scripts/allocator.py View 2 chunks +2 lines, -2 lines 0 comments Download
D client/tests/kvm/scripts/bonding_setup.py View 1 chunk +0 lines, -37 lines 0 comments Download
A client/tests/kvm/scripts/join_mcast.py View 0 chunks +-1 lines, --1 lines 0 comments Download
A client/tests/kvm/scripts/qemu-ifup-ipv6 View 0 chunks +-1 lines, --1 lines 0 comments Download
M client/tests/kvm/scripts/unattended.py View 9 chunks +91 lines, -39 lines 0 comments Download
M client/tests/kvm/scripts/virtio_guest.py View 18 chunks +69 lines, -250 lines 0 comments Download
M client/tests/kvm/tests.cfg.sample View 5 chunks +10 lines, -20 lines 0 comments Download
M client/tests/kvm/tests/build.py View 2 chunks +601 lines, -12 lines 0 comments Download
D client/tests/kvm/tests/clock_getres.py View 1 chunk +0 lines, -39 lines 0 comments Download
M client/tests/kvm/tests/ethtool.py View 7 chunks +16 lines, -19 lines 0 comments Download
M client/tests/kvm/tests/file_transfer.py View 5 chunks +13 lines, -17 lines 0 comments Download
M client/tests/kvm/tests/guest_s4.py View 3 chunks +12 lines, -4 lines 0 comments Download
M client/tests/kvm/tests/guest_test.py View 2 chunks +19 lines, -12 lines 0 comments Download
D client/tests/kvm/tests/image_copy.py View 1 chunk +0 lines, -46 lines 0 comments Download
M client/tests/kvm/tests/iofuzz.py View 3 chunks +11 lines, -9 lines 0 comments Download
M client/tests/kvm/tests/ioquit.py View 1 chunk +7 lines, -3 lines 0 comments Download
M client/tests/kvm/tests/iozone_windows.py View 1 chunk +2 lines, -2 lines 0 comments Download
M client/tests/kvm/tests/jumbo.py View 1 chunk +5 lines, -1 line 0 comments Download
D client/tests/kvm/tests/kdump.py View 1 chunk +0 lines, -74 lines 0 comments Download
M client/tests/kvm/tests/ksm_overcommit.py View 8 chunks +21 lines, -20 lines 0 comments Download
M client/tests/kvm/tests/linux_s3.py View 2 chunks +9 lines, -3 lines 0 comments Download
M client/tests/kvm/tests/mac_change.py View 2 chunks +12 lines, -8 lines 0 comments Download
M client/tests/kvm/tests/migration.py View 4 chunks +11 lines, -8 lines 0 comments Download
D client/tests/kvm/tests/migration_multi_host.py View 1 chunk +0 lines, -108 lines 0 comments Download
D client/tests/kvm/tests/migration_with_file_transfer.py View 1 chunk +0 lines, -92 lines 0 comments Download
D client/tests/kvm/tests/migration_with_reboot.py View 1 chunk +0 lines, -85 lines 0 comments Download
D client/tests/kvm/tests/module_probe.py View 1 chunk +0 lines, -57 lines 0 comments Download
M client/tests/kvm/tests/multicast.py View 4 chunks +9 lines, -9 lines 0 comments Download
M client/tests/kvm/tests/netperf.py View 4 chunks +18 lines, -20 lines 0 comments Download
D client/tests/kvm/tests/nic_bonding.py View 1 chunk +0 lines, -54 lines 0 comments Download
D client/tests/kvm/tests/nic_hotplug.py View 1 chunk +0 lines, -143 lines 0 comments Download
M client/tests/kvm/tests/nic_promisc.py View 5 chunks +25 lines, -32 lines 0 comments Download
M client/tests/kvm/tests/nicdriver_unload.py View 5 chunks +18 lines, -10 lines 0 comments Download
M client/tests/kvm/tests/pci_hotplug.py View 7 chunks +16 lines, -49 lines 0 comments Download
M client/tests/kvm/tests/physical_resources_check.py View 4 chunks +5 lines, -5 lines 0 comments Download
M client/tests/kvm/tests/qemu_img.py View 2 chunks +3 lines, -117 lines 0 comments Download
D client/tests/kvm/tests/set_link.py View 1 chunk +0 lines, -60 lines 0 comments Download
M client/tests/kvm/tests/stepmaker.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/kvm/tests/steps.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/kvm/tests/stress_boot.py View 2 chunks +2 lines, -4 lines 0 comments Download
M client/tests/kvm/tests/timedrift.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/kvm/tests/unittest.py View 2 chunks +3 lines, -3 lines 0 comments Download
M client/tests/kvm/tests/virtio_console.py View 28 chunks +412 lines, -735 lines 0 comments Download
M client/tests/kvm/tests/vlan.py View 5 chunks +26 lines, -15 lines 0 comments Download
D client/tests/kvm/tests/vmstop.py View 1 chunk +0 lines, -82 lines 0 comments Download
M client/tests/kvm/tests/whql_client_install.py View 6 chunks +17 lines, -32 lines 0 comments Download
M client/tests/kvm/tests/whql_submission.py View 4 chunks +68 lines, -153 lines 0 comments Download
M client/tests/kvm/tests_base.cfg.sample View 51 chunks +438 lines, -834 lines 0 comments Download
M client/tests/kvm/unattended/Fedora-13.ks View 1 chunk +1 line, -1 line 0 comments Download
D client/tests/kvm/unattended/Fedora-14.ks View 1 chunk +0 lines, -37 lines 0 comments Download
M client/tests/kvm/unattended/RHEL-5-series.ks View 1 chunk +0 lines, -1 line 0 comments Download
D client/tests/kvm/unattended/RHEL-6-series.ks View 1 chunk +0 lines, -40 lines 0 comments Download
M client/tests/kvm/unattended/win2003-32.sif View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/kvm/unattended/win2003-64.sif View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/kvm/unattended/win2008-32-autounattend.xml View 2 chunks +16 lines, -1 line 0 comments Download
M client/tests/kvm/unattended/win2008-64-autounattend.xml View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/kvm/unattended/win2008-r2-autounattend.xml View 1 chunk +14 lines, -0 lines 0 comments Download
M client/tests/kvm/unattended/win7-32-autounattend.xml View 2 chunks +16 lines, -2 lines 0 comments Download
M client/tests/kvm/unattended/win7-64-autounattend.xml View 2 chunks +2 lines, -2 lines 0 comments Download
M client/tests/kvm/unattended/winvista-32-autounattend.xml View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/kvm/unattended/winvista-64-autounattend.xml View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/kvm/unattended/winxp32.sif View 1 chunk +1 line, -1 line 0 comments Download
client/tests/kvm/unattended/winxp64.sif View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/tracing_microbenchmark/tracers.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/unixbench/unixbench.py View 1 chunk +1 line, -1 line 0 comments Download
D conmux/drivers/dli-lpc View 1 chunk +0 lines, -52 lines 0 comments Download
D conmux/drivers/fence_apc_snmp.py View 1 chunk +0 lines, -370 lines 0 comments Download
M conmux/drivers/module.mk View 1 chunk +2 lines, -2 lines 0 comments Download
D conmux/examples/apc_snmp.cf View 1 chunk +0 lines, -4 lines 0 comments Download
M conmux/start View 1 chunk +1 line, -1 line 0 comments Download
A frontend/afe/resources_test.py View 0 chunks +-1 lines, --1 lines 0 comments Download
A frontend/client/gwt_dir View 0 chunks +-1 lines, --1 lines 0 comments Download
M frontend/client/src/autotest/EmbeddedTkoClient.gwt.xml View 1 chunk +1 line, -1 line 0 comments Download
M frontend/migrations/062_drone_sets_unique.py View 1 chunk +3 lines, -3 lines 0 comments Download
A frontend/planner/control_file_unittest.py View 0 chunks +-1 lines, --1 lines 0 comments Download
A frontend/planner/execution_engine_unittest.py View 0 chunks +-1 lines, --1 lines 0 comments Download
A frontend/planner/rpc_interface_unittest.py View 0 chunks +-1 lines, --1 lines 0 comments Download
A frontend/planner/rpc_utils_unittest.py View 0 chunks +-1 lines, --1 lines 0 comments Download
A frontend/tko/resources_test.py View 0 chunks +-1 lines, --1 lines 0 comments Download
A frontend/tko/rpc_interface_unittest.py View 0 chunks +-1 lines, --1 lines 0 comments Download
M scheduler/drone_manager.py View 2 chunks +4 lines, -4 lines 0 comments Download
M scheduler/drones.py View 3 chunks +1 line, -12 lines 0 comments Download
M scheduler/metahost_scheduler.py View 1 chunk +8 lines, -8 lines 0 comments Download
M server/autotest.py View 2 chunks +0 lines, -2 lines 0 comments Download
M server/autotest_unittest.py View 2 chunks +0 lines, -2 lines 0 comments Download
M server/base_utils.py View 1 chunk +29 lines, -11 lines 0 comments Download
M server/base_utils_unittest.py View 1 chunk +0 lines, -32 lines 0 comments Download
M server/control_segments/cleanup View 1 chunk +4 lines, -1 line 0 comments Download
M server/control_segments/client_wrapper View 1 chunk +3 lines, -1 line 0 comments Download
M server/control_segments/crashdumps View 1 chunk +4 lines, -1 line 0 comments Download
M server/control_segments/crashinfo View 1 chunk +4 lines, -1 line 0 comments Download
M server/control_segments/install View 1 chunk +4 lines, -1 line 0 comments Download
M server/hosts/abstract_ssh.py View 1 chunk +0 lines, -11 lines 0 comments Download
M server/hosts/factory.py View 1 chunk +3 lines, -2 lines 0 comments Download
M server/hosts/logfile_monitor.py View 2 chunks +18 lines, -8 lines 0 comments Download
M server/hosts/remote.py View 2 chunks +3 lines, -3 lines 0 comments Download
M server/hosts/serial.py View 1 chunk +0 lines, -1 line 0 comments Download
M server/prebuild.py View 1 chunk +1 line, -0 lines 0 comments Download
M server/server_job.py View 2 chunks +1 line, -2 lines 0 comments Download
M server/standalone_profiler.py View 2 chunks +1 line, -2 lines 0 comments Download
D server/tests/barriertest_2client/control.srv View 1 chunk +0 lines, -78 lines 0 comments Download
M server/tests/netperf2/netperf2.py View 1 chunk +1 line, -1 line 0 comments Download
A tko/job_serializer.py View 0 chunks +-1 lines, --1 lines 0 comments Download
A tko/job_serializer_unittest.py View 0 chunks +-1 lines, --1 lines 0 comments Download
M tko/parsers/version_1.py View 1 chunk +5 lines, -8 lines 0 comments Download
M tko/parsers/version_1_unittest.py View 3 chunks +6 lines, -6 lines 0 comments Download
M utils/check_patch.py View 15 chunks +36 lines, -65 lines 0 comments Download
M utils/external_packages.py View 1 chunk +1 line, -2 lines 0 comments Download
M utils/run_pylint.py View 2 chunks +4 lines, -10 lines 0 comments Download
M utils/site_test_importer_attributes.py View 2 chunks +7 lines, -0 lines 0 comments Download
M utils/test_importer.py View 1 chunk +0 lines, -6 lines 0 comments Download

Messages

Total messages: 3 (0 generated)
Kenneth Waters
9 years, 11 months ago (2011-01-07 18:57:41 UTC) #1
DaleCurtis
Please hold on this for a half hour or so. We're investigating. If possible want ...
9 years, 11 months ago (2011-01-07 19:25:07 UTC) #2
DaleCurtis
9 years, 11 months ago (2011-01-07 21:00:59 UTC) #3 
lgtm, we can reproduce locally. it's taking too long to debug though.

On 2011/01/07 19:25:07, dalec wrote:
> Please hold on this for a half hour or so. We're investigating. If possible
want
> to avoid reverting this CL at this time.
> 
> On 2011/01/07 18:57:41, Kenneth Waters wrote:

Powered by Google App Engine
This is Rietveld 408576698