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

Issue 4823005: Merge remote branch 'cros/upstream' into tempbranch (Closed)

Created:
10 years, 1 month ago by ericli
Modified:
9 years, 7 months ago
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

Merge remote branch 'cros/upstream' into tempbranch BUG= TEST= Committed: http://chrome-svn/viewvc/chromeos?view=rev&revision=e0493a4

Patch Set 1 #

Total comments: 3

Patch Set 2 : patch #

Unified diffs Side-by-side diffs Delta from patch set Stats (+4570 lines, -1040 lines) Patch
M .gitignore View 1 chunk +15 lines, -0 lines 0 comments Download
M cli/cli_mock.py View 1 chunk +0 lines, -1 line 0 comments Download
A client/bin/cpuset.py View 1 chunk +544 lines, -0 lines 0 comments Download
M client/bin/job.py View 2 chunks +3 lines, -2 lines 0 comments Download
M client/bin/kernel.py View 8 chunks +45 lines, -12 lines 0 comments Download
M client/bin/kernel_unittest.py View 3 chunks +7 lines, -3 lines 0 comments Download
M client/bin/partition.py View 7 chunks +29 lines, -15 lines 0 comments Download
M client/common_lib/autotemp.py View 3 chunks +6 lines, -2 lines 0 comments Download
M client/common_lib/base_packages.py View 1 chunk +3 lines, -4 lines 0 comments Download
M client/common_lib/boottool.py View 1 chunk +5 lines, -9 lines 0 comments Download
M client/common_lib/control_data_unittest.py View 1 chunk +0 lines, -1 line 0 comments Download
M client/common_lib/global_config_unittest.py View 1 chunk +0 lines, -2 lines 0 comments Download
M client/common_lib/utils.py View 6 chunks +409 lines, -1 line 0 comments Download
D client/samples/all_tests View 1 chunk +0 lines, -23 lines 0 comments Download
D client/samples/autotest_console View 1 chunk +0 lines, -16 lines 0 comments Download
D client/samples/build View 1 chunk +0 lines, -6 lines 0 comments Download
D client/samples/build2 View 1 chunk +0 lines, -12 lines 0 comments Download
A client/samples/control.alt_tags View 1 chunk +33 lines, -0 lines 0 comments Download
A client/samples/control.fs View 1 chunk +32 lines, -0 lines 0 comments Download
A client/samples/control.fs_options View 1 chunk +36 lines, -0 lines 0 comments Download
A client/samples/control.interactive_console View 1 chunk +25 lines, -0 lines 0 comments Download
A client/samples/control.kbuild_and_tests View 1 chunk +66 lines, -0 lines 0 comments Download
A client/samples/control.oprofile View 1 chunk +24 lines, -0 lines 0 comments Download
A client/samples/control.oprofile_power5 View 1 chunk +43 lines, -0 lines 0 comments Download
A client/samples/control.parallel View 1 chunk +20 lines, -0 lines 0 comments Download
A client/samples/control.patch_verify View 1 chunk +42 lines, -0 lines 0 comments Download
A client/samples/control.profilers View 1 chunk +24 lines, -0 lines 0 comments Download
A client/samples/control.rpm_kernel View 1 chunk +22 lines, -0 lines 0 comments Download
A client/samples/control.soft_reboot View 1 chunk +29 lines, -0 lines 0 comments Download
A client/samples/control.xenbuild View 1 chunk +31 lines, -0 lines 0 comments Download
D client/samples/ext3_options View 1 chunk +0 lines, -20 lines 0 comments Download
D client/samples/kernelexpand View 1 chunk +0 lines, -1 line 0 comments Download
D client/samples/mirror View 1 chunk +0 lines, -3 lines 0 comments Download
D client/samples/oprofile View 1 chunk +0 lines, -11 lines 0 comments Download
D client/samples/oprofile.power5+ View 1 chunk +0 lines, -24 lines 0 comments Download
D client/samples/parallel View 1 chunk +0 lines, -7 lines 0 comments Download
D client/samples/parallel_dd View 1 chunk +0 lines, -22 lines 0 comments Download
D client/samples/profilers View 1 chunk +0 lines, -9 lines 0 comments Download
D client/samples/reboot View 1 chunk +0 lines, -1 line 0 comments Download
D client/samples/rpm_kernel View 1 chunk +0 lines, -9 lines 0 comments Download
D client/samples/soft_reboot View 1 chunk +0 lines, -24 lines 0 comments Download
D client/samples/test_add_kernel View 1 chunk +0 lines, -19 lines 0 comments Download
D client/samples/test_install View 1 chunk +0 lines, -7 lines 0 comments Download
D client/samples/test_job View 1 chunk +0 lines, -18 lines 0 comments Download
D client/samples/test_xenbuild View 1 chunk +0 lines, -38 lines 0 comments Download
D client/tests/kvm/address_pools.cfg.sample View 1 chunk +0 lines, -65 lines 0 comments Download
M client/tests/kvm/control View 1 chunk +0 lines, -8 lines 0 comments Download
M client/tests/kvm/control.parallel View 1 chunk +0 lines, -9 lines 0 comments Download
M client/tests/kvm/get_started.py View 1 chunk +2 lines, -2 lines 0 comments Download
M client/tests/kvm/kvm_monitor.py View 29 chunks +200 lines, -135 lines 0 comments Download
M client/tests/kvm/kvm_preprocessing.py View 2 chunks +2 lines, -8 lines 0 comments Download
M client/tests/kvm/kvm_subprocess.py View 1 chunk +1 line, -0 lines 0 comments Download
M client/tests/kvm/kvm_test_utils.py View 4 chunks +230 lines, -57 lines 0 comments Download
M client/tests/kvm/kvm_utils.py View 7 chunks +250 lines, -138 lines 0 comments Download
M client/tests/kvm/kvm_vm.py View 12 chunks +120 lines, -55 lines 0 comments Download
A client/tests/kvm/scripts/join_mcast.py View 1 chunk +37 lines, -0 lines 0 comments Download
M client/tests/kvm/scripts/qemu-ifup View 1 chunk +1 line, -0 lines 0 comments Download
A client/tests/kvm/scripts/qemu-ifup-ipv6 View 1 chunk +11 lines, -0 lines 0 comments Download
M client/tests/kvm/scripts/unattended.py View 1 chunk +6 lines, -4 lines 0 comments Download
M client/tests/kvm/tests/build.py View 3 chunks +6 lines, -84 lines 0 comments Download
A client/tests/kvm/tests/ethtool.py View 1 chunk +222 lines, -0 lines 0 comments Download
A client/tests/kvm/tests/file_transfer.py View 1 chunk +90 lines, -0 lines 0 comments Download
A client/tests/kvm/tests/jumbo.py View 1 chunk +130 lines, -0 lines 0 comments Download
A client/tests/kvm/tests/mac_change.py View 1 chunk +65 lines, -0 lines 0 comments Download
A client/tests/kvm/tests/multicast.py View 1 chunk +91 lines, -0 lines 0 comments Download
A client/tests/kvm/tests/netperf.py View 1 chunk +70 lines, -0 lines 0 comments Download
A client/tests/kvm/tests/nic_promisc.py View 1 chunk +103 lines, -0 lines 0 comments Download
A client/tests/kvm/tests/nicdriver_unload.py View 1 chunk +115 lines, -0 lines 0 comments Download
M client/tests/kvm/tests/physical_resources_check.py View 1 chunk +3 lines, -3 lines 0 comments Download
A client/tests/kvm/tests/ping.py View 1 chunk +72 lines, -0 lines 0 comments Download
A client/tests/kvm/tests/pxe.py View 1 chunk +31 lines, -0 lines 0 comments Download
A client/tests/kvm/tests/qmp_basic.py View 1 chunk +395 lines, -0 lines 0 comments Download
M client/tests/kvm/tests/stress_boot.py View 3 chunks +0 lines, -3 lines 0 comments Download
A client/tests/kvm/tests/vlan.py View 1 chunk +185 lines, -0 lines 0 comments Download
D client/tests/kvm/tests/vlan_tag.py View 1 chunk +0 lines, -68 lines 0 comments Download
M client/tests/kvm/tests/whql_client_install.py View 2 chunks +6 lines, -2 lines 0 comments Download
M client/tests/kvm/tests_base.cfg.sample View 22 chunks +133 lines, -36 lines 0 comments Download
M client/tests/kvm/unattended/win2008-32-autounattend.xml View 3 chunks +20 lines, -1 line 0 comments Download
M client/tests/kvm/unattended/win2008-64-autounattend.xml View 1 chunk +7 lines, -3 lines 0 comments Download
M client/tests/kvm/unattended/win2008-r2-autounattend.xml View 2 chunks +21 lines, -3 lines 0 comments Download
M client/tests/kvm/unattended/win7-32-autounattend.xml View 3 chunks +20 lines, -2 lines 0 comments Download
M client/tests/kvm/unattended/win7-64-autounattend.xml View 1 chunk +8 lines, -4 lines 0 comments Download
M client/tests/tiobench/control View 1 chunk +4 lines, -1 line 0 comments Download
M client/tests/tiobench/tiobench.py View 2 chunks +9 lines, -2 lines 0 comments Download
A client/tests/tracing_microbenchmark/base_tracer.py View 1 chunk +30 lines, -0 lines 0 comments Download
A client/tests/tracing_microbenchmark/control View 1 chunk +28 lines, -0 lines 0 comments Download
A client/tests/tracing_microbenchmark/src/Makefile View 1 chunk +8 lines, -0 lines 0 comments Download
A client/tests/tracing_microbenchmark/src/getuid_microbench.c View 1 chunk +63 lines, -0 lines 0 comments Download
A client/tests/tracing_microbenchmark/tracers.py View 1 chunk +60 lines, -0 lines 0 comments Download
A client/tests/tracing_microbenchmark/tracing_microbenchmark.py View 1 chunk +50 lines, -0 lines 0 comments Download
M client/tools/boottool View 3 chunks +48 lines, -5 lines 0 comments Download
M conmux/drivers/reboot-apc View 2 chunks +17 lines, -4 lines 0 comments Download
M frontend/afe/rpc_utils.py View 1 chunk +4 lines, -2 lines 0 comments Download
A frontend/migrations/064_add_jobs_and_tests_time_indices.py View 1 chunk +10 lines, -0 lines 0 comments Download
M global_config.ini View 1 chunk +1 line, -0 lines 0 comments Download
M scheduler/drone_manager.py View 2 chunks +5 lines, -0 lines 0 comments Download
M scheduler/drone_utility.py View 2 chunks +9 lines, -3 lines 0 comments Download
M scheduler/monitor_db.py View 1 chunk +7 lines, -1 line 0 comments Download
M scheduler/monitor_db_cleanup.py View 3 chunks +14 lines, -3 lines 0 comments Download
M scheduler/monitor_db_cleanup_test.py View 3 chunks +33 lines, -1 line 0 comments Download
M scheduler/scheduler_config.py View 1 chunk +1 line, -0 lines 0 comments Download
M server/frontend.py View 6 chunks +16 lines, -4 lines 0 comments Download
M server/git_kernel.py View 2 chunks +6 lines, -2 lines 0 comments Download
M server/hosts/abstract_ssh.py View 1 chunk +1 line, -0 lines 0 comments Download

Messages

Total messages: 4 (0 generated)
ericli
10 years, 1 month ago (2010-11-12 21:38:31 UTC) #1
Dale Curtis
lgtm on abstract_ssh, global_config, job, and utils. On 2010/11/12 21:38:31, ericli wrote:
10 years, 1 month ago (2010-11-12 21:49:48 UTC) #2
truty
I see very little that would affect us. However, there is a DB upgrade which ...
10 years, 1 month ago (2010-11-15 19:32:07 UTC) #3
truty
10 years, 1 month ago (2010-11-15 19:32:25 UTC) #4
lgtm

Powered by Google App Engine
This is Rietveld 408576698