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

Issues Search
    My Issues | Starred     Open | Closed | All

Issue 3554003: Merge remote branch 'cros/upstream' into tempbranch3 (Closed)

Created:
10 years, 2 months ago by ericli
Modified:
9 years, 7 months ago
Reviewers:
CC:
chromium-os-reviews_chromium.org, sosa+cc_chromium.org, seano+cc_chromium.org, ericli, petkov+cc_chromium.org
Visibility:
Public.

Description

Merge remote branch 'cros/upstream' into tempbranch3 Merge to trunk@4817 BUG= TEST= Committed: http://chrome-svn/viewvc/chromeos?view=rev&revision=6f27d4f

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+5782 lines, -1666 lines) Patch
M client/bin/job.py View 1 chunk +2 lines, -1 line 0 comments Download
M client/bin/kernel.py View 7 chunks +57 lines, -62 lines 0 comments Download
M client/bin/kernel_unittest.py View 3 chunks +98 lines, -79 lines 0 comments Download
M client/bin/partition.py View 1 chunk +1 line, -1 line 0 comments Download
M client/common_lib/log.py View 1 chunk +14 lines, -2 lines 0 comments Download
A client/common_lib/revision_control.py View 1 chunk +232 lines, -0 lines 0 comments Download
M client/common_lib/utils.py View 2 chunks +70 lines, -0 lines 0 comments Download
M client/common_lib/utils_unittest.py View 1 chunk +17 lines, -0 lines 0 comments Download
M client/deps/boottool/boottool.py View 2 chunks +3 lines, -4 lines 0 comments Download
D client/deps/boottool/common.py View 1 chunk +0 lines, -8 lines 0 comments Download
D client/deps/dejagnu/common.py View 1 chunk +0 lines, -8 lines 0 comments Download
M client/deps/dejagnu/dejagnu.py View 2 chunks +3 lines, -4 lines 0 comments Download
D client/deps/libaio/common.py View 1 chunk +0 lines, -8 lines 0 comments Download
M client/deps/libaio/libaio.py View 2 chunks +2 lines, -3 lines 0 comments Download
D client/deps/libcap/common.py View 1 chunk +0 lines, -8 lines 0 comments Download
M client/deps/libcap/libcap.py View 2 chunks +2 lines, -2 lines 0 comments Download
D client/deps/libnet/common.py View 1 chunk +0 lines, -8 lines 0 comments Download
M client/deps/libnet/libnet.py View 2 chunks +3 lines, -4 lines 0 comments Download
D client/deps/mysql/common.py View 1 chunk +0 lines, -8 lines 0 comments Download
M client/deps/mysql/mysql.py View 2 chunks +3 lines, -4 lines 0 comments Download
D client/deps/pgpool/common.py View 1 chunk +0 lines, -8 lines 0 comments Download
M client/deps/pgpool/pgpool.py View 2 chunks +3 lines, -4 lines 0 comments Download
D client/deps/pgsql/common.py View 1 chunk +0 lines, -8 lines 0 comments Download
M client/deps/pgsql/pgsql.py View 2 chunks +3 lines, -4 lines 0 comments Download
D client/deps/systemtap/common.py View 1 chunk +0 lines, -8 lines 0 comments Download
M client/deps/systemtap/systemtap.py View 2 chunks +4 lines, -5 lines 0 comments Download
M client/profilers/blktrace/blktrace.py View 1 chunk +1 line, -1 line 0 comments Download
A client/profilers/ftrace/__init__.py View 0 chunks +-1 lines, --1 lines 0 comments Download
A client/profilers/ftrace/control View 1 chunk +3 lines, -0 lines 0 comments Download
A client/profilers/ftrace/ftrace.py View 1 chunk +133 lines, -0 lines 0 comments Download
A client/profilers/ftrace/trace-cmd.tar.bz2 View Binary file 0 comments Download
M client/profilers/lockmeter/lockmeter.py View 1 chunk +1 line, -1 line 0 comments Download
M client/profilers/lttng/lttng.py View 1 chunk +2 lines, -2 lines 0 comments Download
M client/profilers/oprofile/oprofile.py View 1 chunk +3 lines, -3 lines 0 comments Download
M client/profilers/perf/perf.py View 2 chunks +7 lines, -1 line 0 comments Download
M client/profilers/powertop/powertop.py View 1 chunk +1 line, -1 line 0 comments Download
M client/profilers/readprofile/readprofile.py View 1 chunk +2 lines, -2 lines 0 comments Download
M client/samples/filesystem View 2 chunks +9 lines, -9 lines 0 comments Download
M client/tests/aio_dio_bugs/aio_dio_bugs.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/bash_shared_mapping/bash_shared_mapping.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/bonnie/bonnie.py View 1 chunk +2 lines, -2 lines 0 comments Download
M client/tests/cerberus/cerberus.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/cyclictest/cyclictest.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/dbt2/dbt2.py View 1 chunk +4 lines, -6 lines 0 comments Download
M client/tests/ebizzy/ebizzy.py View 1 chunk +1 line, -1 line 0 comments Download
A client/tests/flail/control View 1 chunk +17 lines, -0 lines 0 comments Download
A client/tests/flail/flail.py View 1 chunk +42 lines, -0 lines 0 comments Download
A client/tests/flail/flail-0.2.0.tar.gz View Binary file 0 comments Download
M client/tests/fs_mark/fs_mark.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/fsfuzzer/fsfuzzer.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/fsstress/fsstress.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/interbench/interbench.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/iosched_bugs/iosched_bugs.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/iozone/iozone.py View 1 chunk +4 lines, -4 lines 0 comments Download
M client/tests/iperf/iperf.py View 1 chunk +1 line, -1 line 0 comments Download
A client/tests/kvm/deps/whql_delete_machine_15.cs View 1 chunk +82 lines, -0 lines 0 comments Download
A client/tests/kvm/deps/whql_delete_machine_15.exe View Binary file 0 comments Download
A client/tests/kvm/deps/whql_submission_15.cs View 1 chunk +289 lines, -0 lines 0 comments Download
A client/tests/kvm/deps/whql_submission_15.exe View Binary file 0 comments Download
M client/tests/kvm/kvm_test_utils.py View 1 chunk +39 lines, -15 lines 0 comments Download
M client/tests/kvm/kvm_vm.py View 1 chunk +3 lines, -2 lines 0 comments Download
M client/tests/kvm/scripts/unattended.py View 10 chunks +438 lines, -203 lines 0 comments Download
A client/tests/kvm/scripts/virtio_guest.py View 1 chunk +513 lines, -0 lines 0 comments Download
M client/tests/kvm/tests.cfg.sample View 1 chunk +11 lines, -3 lines 0 comments Download
M client/tests/kvm/tests/build.py View 2 chunks +14 lines, -2 lines 0 comments Download
M client/tests/kvm/tests/ksm_overcommit.py View 1 chunk +5 lines, -0 lines 0 comments Download
M client/tests/kvm/tests/pci_hotplug.py View 3 chunks +85 lines, -30 lines 0 comments Download
M client/tests/kvm/tests/unittest.py View 1 chunk +1 line, -0 lines 0 comments Download
A client/tests/kvm/tests/virtio_console.py View 1 chunk +951 lines, -0 lines 0 comments Download
A client/tests/kvm/tests/whql_client_install.py View 1 chunk +116 lines, -0 lines 0 comments Download
A client/tests/kvm/tests/whql_submission.py View 1 chunk +188 lines, -0 lines 0 comments Download
M client/tests/kvm/tests_base.cfg.sample View 56 chunks +578 lines, -215 lines 0 comments Download
M client/tests/kvm/unattended/Fedora-10.ks View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/kvm/unattended/Fedora-11.ks View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/kvm/unattended/Fedora-12.ks View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/kvm/unattended/Fedora-13.ks View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/kvm/unattended/Fedora-8.ks View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/kvm/unattended/Fedora-9.ks View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/kvm/unattended/OpenSUSE-11.xml View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/kvm/unattended/RHEL-3-series.ks View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/kvm/unattended/RHEL-4-series.ks View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/kvm/unattended/RHEL-5-series.ks View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/kvm/unattended/SLES-11.xml View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/kvm/unattended/win2003-32.sif View 2 chunks +8 lines, -6 lines 0 comments Download
M client/tests/kvm/unattended/win2003-64.sif View 2 chunks +8 lines, -6 lines 0 comments Download
M client/tests/kvm/unattended/win2008-32-autounattend.xml View 2 chunks +24 lines, -6 lines 0 comments Download
M client/tests/kvm/unattended/win2008-64-autounattend.xml View 2 chunks +24 lines, -6 lines 0 comments Download
M client/tests/kvm/unattended/win2008-r2-autounattend.xml View 2 chunks +24 lines, -6 lines 0 comments Download
M client/tests/kvm/unattended/win7-32-autounattend.xml View 2 chunks +25 lines, -7 lines 0 comments Download
M client/tests/kvm/unattended/win7-64-autounattend.xml View 2 chunks +25 lines, -7 lines 0 comments Download
M client/tests/kvm/unattended/winvista-32-autounattend.xml View 2 chunks +24 lines, -6 lines 0 comments Download
M client/tests/kvm/unattended/winvista-64-autounattend.xml View 2 chunks +24 lines, -6 lines 0 comments Download
M client/tests/kvm/unattended/winxp32.sif View 2 chunks +5 lines, -3 lines 0 comments Download
M client/tests/kvm/unattended/winxp64.sif View 2 chunks +5 lines, -3 lines 0 comments Download
M client/tests/kvm/unittests.cfg.sample View 1 chunk +1 line, -0 lines 0 comments Download
M client/tests/libhugetlbfs/libhugetlbfs.py View 2 chunks +4 lines, -4 lines 0 comments Download
M client/tests/lmbench/lmbench.py View 2 chunks +3 lines, -3 lines 0 comments Download
M client/tests/ltp/ltp.py View 1 chunk +2 lines, -2 lines 0 comments Download
M client/tests/monotonic_time/monotonic_time.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/netperf2/netperf2.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/netpipe/netpipe.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/perfmon/perfmon.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/pi_tests/pi_tests.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/posixtest/posixtest.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/qemu_iotests/qemu_iotests.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/rtc/rtc.py View 1 chunk +2 lines, -2 lines 0 comments Download
M client/tests/scrashme/scrashme.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/signaltest/signaltest.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/sparse/sparse.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/spew/spew.py View 1 chunk +2 lines, -2 lines 0 comments Download
M client/tests/stress/stress.py View 1 chunk +2 lines, -2 lines 0 comments Download
M client/tests/synctest/synctest.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/sysbench/sysbench.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/systemtap/systemtap.py View 1 chunk +2 lines, -2 lines 0 comments Download
M client/tests/tbench/tbench.py View 1 chunk +2 lines, -2 lines 0 comments Download
M client/tests/tsc/tsc.py View 1 chunk +1 line, -1 line 0 comments Download
M client/tests/xmtest/xmtest.py View 1 chunk +2 lines, -2 lines 0 comments Download
M frontend/client/src/autotest/afe/AfeClient.java View 5 chunks +20 lines, -19 lines 0 comments Download
M frontend/client/src/autotest/afe/AfeUtils.java View 5 chunks +14 lines, -5 lines 0 comments Download
A frontend/client/src/autotest/afe/CheckBoxPanel.java View 1 chunk +47 lines, -0 lines 0 comments Download
A frontend/client/src/autotest/afe/CheckBoxPanelDisplay.java View 1 chunk +26 lines, -0 lines 0 comments Download
M frontend/client/src/autotest/afe/ClassFactory.java View 1 chunk +4 lines, -3 lines 0 comments Download
A frontend/client/src/autotest/afe/ControlTypeSelect.java View 1 chunk +38 lines, -0 lines 0 comments Download
A frontend/client/src/autotest/afe/ControlTypeSelectDisplay.java View 1 chunk +30 lines, -0 lines 0 comments Download
M frontend/client/src/autotest/afe/HostDetailView.java View 15 chunks +41 lines, -40 lines 0 comments Download
M frontend/client/src/autotest/afe/HostListView.java View 7 chunks +24 lines, -24 lines 0 comments Download
M frontend/client/src/autotest/afe/HostSelector.java View 3 chunks +6 lines, -6 lines 0 comments Download
A frontend/client/src/autotest/afe/IButton.java View 1 chunk +17 lines, -0 lines 0 comments Download
A frontend/client/src/autotest/afe/ICheckBox.java View 1 chunk +20 lines, -0 lines 0 comments Download
A frontend/client/src/autotest/afe/IRadioButton.java View 1 chunk +19 lines, -0 lines 0 comments Download
A frontend/client/src/autotest/afe/ITextArea.java View 1 chunk +11 lines, -0 lines 0 comments Download
A frontend/client/src/autotest/afe/ITextBox.java View 1 chunk +12 lines, -0 lines 0 comments Download
M frontend/client/src/autotest/afe/TestSelector.java View 6 chunks +88 lines, -84 lines 0 comments Download
A frontend/client/src/autotest/afe/TestSelectorDisplay.java View 1 chunk +73 lines, -0 lines 0 comments Download
M frontend/client/src/autotest/afe/UserPreferencesView.java View 4 chunks +15 lines, -8 lines 0 comments Download
A frontend/client/src/autotest/afe/create/CreateJobViewDisplay.java View 1 chunk +232 lines, -0 lines 0 comments Download
A + frontend/client/src/autotest/afe/create/CreateJobViewPresenter.java View 19 chunks +202 lines, -328 lines 0 comments Download
A frontend/client/src/autotest/afe/create/CreateJobViewTab.java View 1 chunk +54 lines, -0 lines 0 comments Download
M frontend/client/src/autotest/common/table/DynamicTable.java View 12 chunks +56 lines, -55 lines 0 comments Download
M frontend/client/src/autotest/common/ui/MultiListSelectPresenter.java View 11 chunks +19 lines, -14 lines 0 comments Download
M frontend/client/src/autotest/common/ui/RadioChooser.java View 2 chunks +22 lines, -23 lines 0 comments Download
A frontend/client/src/autotest/common/ui/RadioChooserDisplay.java View 1 chunk +23 lines, -0 lines 0 comments Download
M frontend/client/src/autotest/common/ui/SimplifiedList.java View 1 chunk +1 line, -0 lines 0 comments Download
M frontend/tko/rpc_interface.py View 2 chunks +16 lines, -0 lines 0 comments Download
M frontend/tko/rpc_interface_unittest.py View 2 chunks +3 lines, -0 lines 0 comments Download
M scheduler/monitor_db.py View 2 chunks +2 lines, -1 line 0 comments Download
M scheduler/scheduler_models.py View 4 chunks +131 lines, -14 lines 0 comments Download
M server/autotest.py View 1 chunk +3 lines, -4 lines 0 comments Download
M server/git.py View 2 chunks +80 lines, -127 lines 0 comments Download
M server/git_kernel.py View 1 chunk +81 lines, -34 lines 0 comments Download
M server/hosts/remote.py View 4 chunks +23 lines, -1 line 0 comments Download
M server/hosts/serial.py View 3 chunks +4 lines, -1 line 0 comments Download
M server/server_job.py View 1 chunk +3 lines, -1 line 0 comments Download
M tko/parsers/version_1.py View 2 chunks +7 lines, -2 lines 0 comments Download
M utils/external_packages.py View 1 chunk +2 lines, -2 lines 0 comments Download

Powered by Google App Engine
This is Rietveld 408576698