diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-02-22 22:05:42 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-02-22 22:05:42 +0000 |
commit | bbb91eaeaeed417c31163811c9c4184cdeaa0e6f (patch) | |
tree | 746ad33d2d8872d29525b5105c8ef6fb1638c3d1 | |
parent | 66848876426a2c069a5aed6fe9c155c48c47d08f (diff) | |
parent | 5f019afdc9e12f035bbe463191e6d1665912e03b (diff) | |
download | chromium-trace-bbb91eaeaeed417c31163811c9c4184cdeaa0e6f.tar.gz |
Merge "Do not check in upstream OWNERS files"
-rw-r--r-- | catapult/common/OWNERS | 5 | ||||
-rw-r--r-- | catapult/common/battor/OWNERS | 2 | ||||
-rw-r--r-- | catapult/common/eslint/OWNERS | 2 | ||||
-rw-r--r-- | catapult/dependency_manager/OWNERS | 1 | ||||
-rw-r--r-- | catapult/dependency_manager/dependency_manager/OWNERS | 1 | ||||
-rw-r--r-- | catapult/devil/OWNERS | 4 | ||||
-rw-r--r-- | catapult/devil/devil/OWNERS | 4 | ||||
-rw-r--r-- | catapult/systrace/bin/OWNERS | 6 | ||||
-rw-r--r-- | catapult/systrace/profile_chrome/OWNERS | 2 | ||||
-rw-r--r-- | catapult/systrace/systrace/OWNERS | 1 | ||||
-rw-r--r-- | catapult/telemetry/OWNERS | 22 | ||||
-rw-r--r-- | catapult/telemetry/telemetry/timeline/OWNERS | 1 | ||||
-rwxr-xr-x | update.py | 4 |
13 files changed, 3 insertions, 52 deletions
diff --git a/catapult/common/OWNERS b/catapult/common/OWNERS deleted file mode 100644 index 67204793..00000000 --- a/catapult/common/OWNERS +++ /dev/null @@ -1,5 +0,0 @@ -dtu@chromium.org -eakuefner@chromium.org -fmeawad@chromium.org -simonhatch@chromium.org -sullivan@chromium.org diff --git a/catapult/common/battor/OWNERS b/catapult/common/battor/OWNERS deleted file mode 100644 index 76381185..00000000 --- a/catapult/common/battor/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -charliea@chromium.org -rnephew@chromium.org diff --git a/catapult/common/eslint/OWNERS b/catapult/common/eslint/OWNERS deleted file mode 100644 index 137ed401..00000000 --- a/catapult/common/eslint/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -charliea@chromium.org -eakuefner@chromium.org
\ No newline at end of file diff --git a/catapult/dependency_manager/OWNERS b/catapult/dependency_manager/OWNERS deleted file mode 100644 index ca5ce3b9..00000000 --- a/catapult/dependency_manager/OWNERS +++ /dev/null @@ -1 +0,0 @@ -aiolos@chromium.org diff --git a/catapult/dependency_manager/dependency_manager/OWNERS b/catapult/dependency_manager/dependency_manager/OWNERS deleted file mode 100644 index ca5ce3b9..00000000 --- a/catapult/dependency_manager/dependency_manager/OWNERS +++ /dev/null @@ -1 +0,0 @@ -aiolos@chromium.org diff --git a/catapult/devil/OWNERS b/catapult/devil/OWNERS deleted file mode 100644 index fd584fcd..00000000 --- a/catapult/devil/OWNERS +++ /dev/null @@ -1,4 +0,0 @@ -jbudorick@chromium.org -mikecase@chromium.org -perezju@chromium.org -rnephew@chromium.org diff --git a/catapult/devil/devil/OWNERS b/catapult/devil/devil/OWNERS deleted file mode 100644 index fd584fcd..00000000 --- a/catapult/devil/devil/OWNERS +++ /dev/null @@ -1,4 +0,0 @@ -jbudorick@chromium.org -mikecase@chromium.org -perezju@chromium.org -rnephew@chromium.org diff --git a/catapult/systrace/bin/OWNERS b/catapult/systrace/bin/OWNERS deleted file mode 100644 index 374072a7..00000000 --- a/catapult/systrace/bin/OWNERS +++ /dev/null @@ -1,6 +0,0 @@ -per-file adb_profile_chrome=file://systrace/profile_chrome/OWNERS -per-file adb_profile_chrome_startup=file://systrace/profile_chrome/OWNERS - -per-file systrace=file://systrace/systrace/OWNERS - -ccraik@google.com diff --git a/catapult/systrace/profile_chrome/OWNERS b/catapult/systrace/profile_chrome/OWNERS deleted file mode 100644 index 51a6670d..00000000 --- a/catapult/systrace/profile_chrome/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -skyostil@chromium.org -zhenw@chromium.org diff --git a/catapult/systrace/systrace/OWNERS b/catapult/systrace/systrace/OWNERS deleted file mode 100644 index a007f0a3..00000000 --- a/catapult/systrace/systrace/OWNERS +++ /dev/null @@ -1 +0,0 @@ -ccraik@google.com diff --git a/catapult/telemetry/OWNERS b/catapult/telemetry/OWNERS deleted file mode 100644 index d1c1363a..00000000 --- a/catapult/telemetry/OWNERS +++ /dev/null @@ -1,22 +0,0 @@ -# For more information about telemetry development, please see: -# http://dev.chromium.org/developers/telemetry/telemetry-feature-guidelines - -# For CrOS-related changes. -achuith@chromium.org - -# For web_perf/, value/, internal/results/ related changes. -eakuefner@chromium.org - -aiolos@chromium.org -dtu@chromium.org -nednguyen@google.com -skyostil@chromium.org -sullivan@chromium.org -zhenw@chromium.org - -# emeritus: -# chrishenry@google.com -# ernstm@chromium.org -# marja@chromium.org -# nduca@chromium.org -# tonyg@chromium.org diff --git a/catapult/telemetry/telemetry/timeline/OWNERS b/catapult/telemetry/telemetry/timeline/OWNERS deleted file mode 100644 index d12cc955..00000000 --- a/catapult/telemetry/telemetry/timeline/OWNERS +++ /dev/null @@ -1 +0,0 @@ -tengs@chromium.org @@ -4,6 +4,7 @@ import codecs, httplib, json, optparse, os, urllib, shutil, subprocess, sys upstream_git = 'https://github.com/catapult-project/catapult.git' PACKAGE_DIRS = ['common', 'dependency_manager', 'devil', 'systrace', 'telemetry'] +IGNORE_PATTERNS = ['OWNERS'] # doesn't make sense to sync owners files script_dir = os.path.dirname(os.path.abspath(sys.argv[0])) catapult_src_dir = os.path.join(script_dir, 'catapult-upstream') @@ -60,4 +61,5 @@ update_systrace_trace_viewer.update(no_auto_update=True, no_min=options.no_min) shutil.rmtree(catapult_dst_dir) for d in PACKAGE_DIRS: shutil.copytree(os.path.join(catapult_src_dir, d), - os.path.join(catapult_dst_dir, d)) + os.path.join(catapult_dst_dir, d), + ignore=shutil.ignore_patterns(*IGNORE_PATTERNS)) |