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

Issues Search
    My Issues | Starred     Open | Closed | All

Issue 2195983002: Fix histograms.xml after refs/heads/master@{#408528} (Closed)

Created:
4 years, 4 months ago by boliu
Modified:
4 years, 4 months ago
Reviewers:
Steven Holte
CC:
chromium-reviews, asvitkine+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Fix histograms.xml after refs/heads/master@{#408528} BUG=596235

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1 line, -0 lines) Patch
M tools/metrics/histograms/histograms.xml View 1 chunk +1 line, -0 lines 0 comments Download

Messages

Total messages: 8 (4 generated)
boliu
ptal, thanks
4 years, 4 months ago (2016-07-30 00:28:18 UTC) #2
Steven Holte
lgtm
4 years, 4 months ago (2016-07-30 00:49:30 UTC) #3
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2195983002/1
4 years, 4 months ago (2016-07-30 00:50:16 UTC) #5
commit-bot: I haz the power
4 years, 4 months ago (2016-07-30 02:02:38 UTC) #7 
Failed to apply patch for tools/metrics/histograms/histograms.xml:
While running git apply --index -3 -p1;
  error: patch failed: tools/metrics/histograms/histograms.xml:67596
  Falling back to three-way merge...
  Applied patch to 'tools/metrics/histograms/histograms.xml' with conflicts.
  U tools/metrics/histograms/histograms.xml

Patch:       tools/metrics/histograms/histograms.xml
Index: tools/metrics/histograms/histograms.xml
diff --git a/tools/metrics/histograms/histograms.xml
b/tools/metrics/histograms/histograms.xml
index
a522cf4f5f295f63896ab19e6960e39f7f923ed2..076d2cf099a7c27edec4272cd4511dd8255b3151
100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -67596,6 +67596,7 @@ http://cs/file:chrome/histograms.xml - but prefer this
file for new entries.
   <int value="129" label="SWDH_SET_HOSTED_VERSION_PROCESS_MISMATCH"/>
   <int value="130" label="MSDH_INVALID_FRAME_ID"/>
   <int value="131" label="SDH_INVALID_PORT_RANGE"/>
+  <int value="132" label="SCO_INVALID_ARGUMENT"/>
 </enum>
 
 <enum name="BadMessageReasonExtensions" type="int">

Powered by Google App Engine
This is Rietveld 408576698