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

Issue 887423002: Add |device_heartbeat_settings| to device policy proto (Closed)

Created:
5 years, 10 months ago by bartfab (slow)
Modified:
5 years, 10 months ago
CC:
chromium-reviews, stevenjb+watch_chromium.org, davemoore+watch_chromium.org, oshima+watch_chromium.org, nkostylev+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Add |device_heartbeat_settings| to device policy proto This CL adds |device_heartbeat_settings| to the device policy proto. We accidentally added |device_heartbeat_settings| with index 34 on the server and |reboot_on_shutdown| with the same index on the client. To resolve this conflict, one of the two settings needs to change index. Since |device_heartbeat_settings| is not being read or written by anyone yet, it is the one to move. We must avoid such conflicts in the future by adding all policies on the client-side first and syncing the resulting proto to the server. In general, new policies should be added to the device policy proto and policy_templates.json at the same time. As an emergency fix, this CL gets a free pass for that rule as it is an emergency fix. BUG=430908 TEST=None Committed: https://crrev.com/2d7b3827311376842db9481bae84b0150a72017a Cr-Commit-Position: refs/heads/master@{#314346}

Patch Set 1 #

Patch Set 2 : Grammar fix. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+12 lines, -0 lines) Patch
M chrome/browser/chromeos/policy/proto/chrome_device_policy.proto View 1 2 chunks +12 lines, -0 lines 0 comments Download

Messages

Total messages: 7 (2 generated)
bartfab (slow)
Hi Drew, Please take a look.
5 years, 10 months ago (2015-02-02 12:29:12 UTC) #2
Andrew T Wilson (Slow)
lgtm
5 years, 10 months ago (2015-02-03 15:48:42 UTC) #3
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/887423002/2
5 years, 10 months ago (2015-02-03 15:52:59 UTC) #5
commit-bot: I haz the power
Committed patchset #2 (id:2)
5 years, 10 months ago (2015-02-03 16:28:28 UTC) #6
commit-bot: I haz the power
5 years, 10 months ago (2015-02-03 16:29:27 UTC) #7
Message was sent while issue was closed.
Patchset 2 (id:??) landed as
https://crrev.com/2d7b3827311376842db9481bae84b0150a72017a
Cr-Commit-Position: refs/heads/master@{#314346}

Powered by Google App Engine
This is Rietveld 408576698