chromeos/test/data/network/augmented_merge.json - Issue 12676017: Adding policy support to the new network configuration stack.

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: chromeos/test/data/network/augmented_merge.json

Issue 12676017: Adding policy support to the new network configuration stack. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressed Julian's comments. Reuploaded with rebase. Created 7 years, 8 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: chromeos/test/data/network/augmented_merge.json

diff --git a/chromeos/test/data/network/augmented_merge.json b/chromeos/test/data/network/augmented_merge.json

index 60ae5b08ed1396940c9abe6df1f7c83910516bdf..fbd90ba814a788c32ec2e9623d6be01b953f3cb3 100644

--- a/chromeos/test/data/network/augmented_merge.json

+++ b/chromeos/test/data/network/augmented_merge.json

@@ -61,9 +61,7 @@

"UserPolicy": 1

"PSK": {

- "DevicePolicy": "sharedkey",

"Effective": "UserPolicy",

- "UserPolicy": "sharedkey"

}

"OpenVPN": {