sync/protocol/client_debug_info.proto - Issue 11314008: sync: Follow-up to conflict resolution refactor

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: sync/protocol/client_debug_info.proto

Issue 11314008: sync: Follow-up to conflict resolution refactor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix tests Created 8 years, 2 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:

Index: sync/protocol/client_debug_info.proto

diff --git a/sync/protocol/client_debug_info.proto b/sync/protocol/client_debug_info.proto

index 94635b7ae13fccfc76cba5f11dde2e6e3c547918..55db11799ba2c5c7fd7f5b48eaea46940b1e946c 100644

--- a/sync/protocol/client_debug_info.proto

+++ b/sync/protocol/client_debug_info.proto

@@ -31,7 +31,7 @@ message SyncCycleCompletedEventInfo {

// These new conflict counters replace the ones above.

optional int32 num_encryption_conflicts = 4;

optional int32 num_hierarchy_conflicts = 5;

- optional int32 num_simple_conflicts = 6;

+ optional int32 num_simple_conflicts = 6; // No longer sent since M24.

optional int32 num_server_conflicts = 7;

// Counts to track the effective usefulness of our GetUpdate requests.

« no previous file with comments | « sync/internal_api/sync_manager_impl.cc ('k') | sync/protocol/get_updates_caller_info.proto » ('j') | no next file with comments »