summaryrefslogtreecommitdiff
path: root/caddyconfig
diff options
context:
space:
mode:
authorMatt Holt <mholt@users.noreply.github.com>2019-10-10 11:27:45 -0600
committerGitHub <noreply@github.com>2019-10-10 11:27:45 -0600
commitb38365ff3b6ab8b2c474603fa0603831e7eff2a7 (patch)
tree7a35ea901e4ce8d3fbe028e8fc81bd1f69c6be68 /caddyconfig
parent53dd600b4de0c2b169f1eb4450a0f02950912524 (diff)
parent26cc8837084f9cea6057e9908f0b5bde0eb15d3e (diff)
Merge pull request #2799 from caddyserver/v2-enterprise-merge
v2: Merge enterprise code into open source v2 branch
Diffstat (limited to 'caddyconfig')
-rw-r--r--caddyconfig/configadapters.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/caddyconfig/configadapters.go b/caddyconfig/configadapters.go
index 1a0801f..071221f 100644
--- a/caddyconfig/configadapters.go
+++ b/caddyconfig/configadapters.go
@@ -27,10 +27,10 @@ type Adapter interface {
// Warning represents a warning or notice related to conversion.
type Warning struct {
- File string
- Line int
- Directive string
- Message string
+ File string `json:"file,omitempty"`
+ Line int `json:"line,omitempty"`
+ Directive string `json:"directive,omitempty"`
+ Message string `json:"message,omitempty"`
}
// JSON encodes val as JSON, returning it as a json.RawMessage. Any