telemetry/telemetry/value/__init__.py - Issue 2162963002: [polymer] Merge of master into polymer10-migration

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: telemetry/telemetry/value/init.py

Issue 2162963002: [polymer] Merge of master into polymer10-migration (Closed) Base URL: git@github.com:catapult-project/catapult.git@polymer10-migration

Patch Set: Merge polymer10-migration int polymer10-merge Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: telemetry/telemetry/value/__init__.py

diff --git a/telemetry/telemetry/value/__init__.py b/telemetry/telemetry/value/__init__.py

index dbd7085da49a74eac37859b88959fe4310497ca9..eb58f6222effc1fdd3cbc6640e7caa990bf07b17 100644

--- a/telemetry/telemetry/value/__init__.py

+++ b/telemetry/telemetry/value/__init__.py

@@ -25,12 +25,6 @@ import os

from telemetry.core import discover

from telemetry.core import util

-# When combining a pair of Values togehter, it is sometimes ambiguous whether

-# the values should be concatenated, or one should be picked as representative.

-# The possible merging policies are listed here.

-CONCATENATE = 'concatenate'

-PICK_FIRST = 'pick-first'

# When converting a Value to its buildbot equivalent, the context in which the

# value is being interpreted actually affects the conversion. This is insane,

# but there you have it. There are three contexts in which Values are converted

« no previous file with comments | « telemetry/telemetry/timeline/tracing_config.py ('k') | telemetry/telemetry/value/list_of_scalar_values.py » ('j') | no next file with comments »

Unified Diff: telemetry/telemetry/value/__init__.py

Unified Diff: telemetry/telemetry/value/init.py