chromeos/test/data/network/augmented_merge.json - Issue 750313003: ONC: Add IPConfigType.

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 750313003: ONC: Add IPConfigType. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ipconfig_object

Patch Set: Change clearing of StaticIPConfig. Created 6 years 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 5c7c434978d587aeb577ad7453815ca68d31b818..01366c944d3fe105acbdc8f920f0bb22b4f0b29c 100644

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

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

@@ -13,7 +13,12 @@

"IPAddress": "124.124.124.124",

"NameServers": [ "1.1.1.5", "1.1.1.6" ],

"RoutingPrefix": 25,

- "Type": "IPv4",

+ "Type": "IPv4"

+ },

+ "IPConfigType": {

+ "DevicePolicy": "Static",

+ "Effective": "UserPolicy",

+ "UserSetting": "Static"

"StaticIPConfig": {

"IPAddress": {

« no previous file with comments | « chromeos/network/onc/onc_validator.cc ('k') | chromeos/test/data/network/device_policy.onc » ('j') | no next file with comments »