docstring_tokens
stringlengths
0
76.5k
code_tokens
stringlengths
75
1.81M
label_window
sequencelengths
4
2.12k
html_url
stringlengths
74
116
file_name
stringlengths
3
311
stringutil.WriteToBuilder(b, m.Path)
<mask> } <mask> <mask> b := &strings.Builder{} <mask> <mask> aghstrings.WriteToBuilder(b, m.Path) <mask> if ver := m.Version; ver != "" { <mask> sep := modInfoAtSep <mask> if ver == "(devel)" { <mask> sep = modInfoDevSep <mask> } </s> Pull request: all: replace aghstrings with stringutil Merge in DNS/adguard-home from add-stringutil to master Squashed commit of the following: commit 4ca9b29356de7d0a162b1e5a6496c691e9751f15 Author: Ainar Garipov <[email protected]> Date: Thu Jul 29 17:29:25 2021 +0300 all: replace aghstrings with stringutil </s> remove aghstrings.WriteToBuilder(b, sep, ver) </s> add stringutil.WriteToBuilder(b, sep, ver) </s> remove aghstrings.WriteToBuilder(b, strings.ToLower(h), "\n") </s> add stringutil.WriteToBuilder(b, strings.ToLower(h), "\n") </s> remove aghstrings.WriteToBuilder(b, nl, vFmtDepsHdr) </s> add stringutil.WriteToBuilder(b, nl, vFmtDepsHdr) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtGOMIPSHdr, gomips) </s> add stringutil.WriteToBuilder(b, nl, vFmtGOMIPSHdr, gomips) </s> remove aghstrings.WriteToBuilder(b, nltb, depStr) </s> add stringutil.WriteToBuilder(b, nltb, depStr)
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/63ee95dfbed2ee4320779dfca78f4cb5e4ad86e6
internal/version/version.go
stringutil.WriteToBuilder(b, sep, ver)
<mask> sep := modInfoAtSep <mask> if ver == "(devel)" { <mask> sep = modInfoDevSep <mask> } <mask> aghstrings.WriteToBuilder(b, sep, ver) <mask> } <mask> if sum := m.Sum; sum != "" { <mask> aghstrings.WriteToBuilder(b, modInfoSumLeft, sum, modInfoSumRight) <mask> } <mask> </s> Pull request: all: replace aghstrings with stringutil Merge in DNS/adguard-home from add-stringutil to master Squashed commit of the following: commit 4ca9b29356de7d0a162b1e5a6496c691e9751f15 Author: Ainar Garipov <[email protected]> Date: Thu Jul 29 17:29:25 2021 +0300 all: replace aghstrings with stringutil </s> remove aghstrings.WriteToBuilder(b, modInfoSumLeft, sum, modInfoSumRight) </s> add stringutil.WriteToBuilder(b, modInfoSumLeft, sum, modInfoSumRight) </s> remove aghstrings.WriteToBuilder(b, m.Path) </s> add stringutil.WriteToBuilder(b, m.Path) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtDepsHdr) </s> add stringutil.WriteToBuilder(b, nl, vFmtDepsHdr) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtGOMIPSHdr, gomips) </s> add stringutil.WriteToBuilder(b, nl, vFmtGOMIPSHdr, gomips) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtGOOSHdr, nl, vFmtGOARCHHdr) </s> add stringutil.WriteToBuilder(b, nl, vFmtGOOSHdr, nl, vFmtGOARCHHdr)
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/63ee95dfbed2ee4320779dfca78f4cb5e4ad86e6
internal/version/version.go
stringutil.WriteToBuilder(b, modInfoSumLeft, sum, modInfoSumRight)
<mask> } <mask> aghstrings.WriteToBuilder(b, sep, ver) <mask> } <mask> if sum := m.Sum; sum != "" { <mask> aghstrings.WriteToBuilder(b, modInfoSumLeft, sum, modInfoSumRight) <mask> } <mask> <mask> return b.String() <mask> } <mask> </s> Pull request: all: replace aghstrings with stringutil Merge in DNS/adguard-home from add-stringutil to master Squashed commit of the following: commit 4ca9b29356de7d0a162b1e5a6496c691e9751f15 Author: Ainar Garipov <[email protected]> Date: Thu Jul 29 17:29:25 2021 +0300 all: replace aghstrings with stringutil </s> remove aghstrings.WriteToBuilder(b, sep, ver) </s> add stringutil.WriteToBuilder(b, sep, ver) </s> remove aghstrings.WriteToBuilder(b, nltb, depStr) </s> add stringutil.WriteToBuilder(b, nltb, depStr) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtRaceHdr, strconv.FormatBool(isRace)) </s> add stringutil.WriteToBuilder(b, nl, vFmtRaceHdr, strconv.FormatBool(isRace)) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtDepsHdr) </s> add stringutil.WriteToBuilder(b, nl, vFmtDepsHdr) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtGOOSHdr, nl, vFmtGOARCHHdr) </s> add stringutil.WriteToBuilder(b, nl, vFmtGOOSHdr, nl, vFmtGOARCHHdr)
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/63ee95dfbed2ee4320779dfca78f4cb5e4ad86e6
internal/version/version.go
stringutil.WriteToBuilder(
<mask> // TODO(e.burkov): Make it write into passed io.Writer. <mask> func Verbose() (v string) { <mask> b := &strings.Builder{} <mask> <mask> aghstrings.WriteToBuilder( <mask> b, <mask> vFmtAGHHdr, <mask> nl, <mask> vFmtVerHdr, <mask> version, </s> Pull request: all: replace aghstrings with stringutil Merge in DNS/adguard-home from add-stringutil to master Squashed commit of the following: commit 4ca9b29356de7d0a162b1e5a6496c691e9751f15 Author: Ainar Garipov <[email protected]> Date: Thu Jul 29 17:29:25 2021 +0300 all: replace aghstrings with stringutil </s> remove aghstrings.WriteToBuilder(b, strings.ToLower(h), "\n") </s> add stringutil.WriteToBuilder(b, strings.ToLower(h), "\n") </s> remove aghstrings.WriteToBuilder(b, m.Path) </s> add stringutil.WriteToBuilder(b, m.Path) </s> remove upstreams = aghstrings.FilterOut(upstreams, aghstrings.IsCommentOrEmpty) </s> add upstreams = stringutil.FilterOut(upstreams, IsCommentOrEmpty) </s> remove aghstrings.WriteToBuilder( </s> add stringutil.WriteToBuilder(
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/63ee95dfbed2ee4320779dfca78f4cb5e4ad86e6
internal/version/version.go
stringutil.WriteToBuilder(b, nl, vFmtTimeHdr, buildtime)
<mask> vFmtGoHdr, <mask> runtime.Version(), <mask> ) <mask> if buildtime != "" { <mask> aghstrings.WriteToBuilder(b, nl, vFmtTimeHdr, buildtime) <mask> } <mask> aghstrings.WriteToBuilder(b, nl, vFmtGOOSHdr, nl, vFmtGOARCHHdr) <mask> if goarm != "" { <mask> aghstrings.WriteToBuilder(b, nl, vFmtGOARMHdr, "v", goarm) <mask> } else if gomips != "" { </s> Pull request: all: replace aghstrings with stringutil Merge in DNS/adguard-home from add-stringutil to master Squashed commit of the following: commit 4ca9b29356de7d0a162b1e5a6496c691e9751f15 Author: Ainar Garipov <[email protected]> Date: Thu Jul 29 17:29:25 2021 +0300 all: replace aghstrings with stringutil </s> remove aghstrings.WriteToBuilder(b, nl, vFmtGOOSHdr, nl, vFmtGOARCHHdr) </s> add stringutil.WriteToBuilder(b, nl, vFmtGOOSHdr, nl, vFmtGOARCHHdr) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtGOARMHdr, "v", goarm) </s> add stringutil.WriteToBuilder(b, nl, vFmtGOARMHdr, "v", goarm) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtGOMIPSHdr, gomips) </s> add stringutil.WriteToBuilder(b, nl, vFmtGOMIPSHdr, gomips) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtRaceHdr, strconv.FormatBool(isRace)) </s> add stringutil.WriteToBuilder(b, nl, vFmtRaceHdr, strconv.FormatBool(isRace)) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtDepsHdr) </s> add stringutil.WriteToBuilder(b, nl, vFmtDepsHdr)
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/63ee95dfbed2ee4320779dfca78f4cb5e4ad86e6
internal/version/version.go
stringutil.WriteToBuilder(b, nl, vFmtGOOSHdr, nl, vFmtGOARCHHdr)
<mask> ) <mask> if buildtime != "" { <mask> aghstrings.WriteToBuilder(b, nl, vFmtTimeHdr, buildtime) <mask> } <mask> aghstrings.WriteToBuilder(b, nl, vFmtGOOSHdr, nl, vFmtGOARCHHdr) <mask> if goarm != "" { <mask> aghstrings.WriteToBuilder(b, nl, vFmtGOARMHdr, "v", goarm) <mask> } else if gomips != "" { <mask> aghstrings.WriteToBuilder(b, nl, vFmtGOMIPSHdr, gomips) <mask> } </s> Pull request: all: replace aghstrings with stringutil Merge in DNS/adguard-home from add-stringutil to master Squashed commit of the following: commit 4ca9b29356de7d0a162b1e5a6496c691e9751f15 Author: Ainar Garipov <[email protected]> Date: Thu Jul 29 17:29:25 2021 +0300 all: replace aghstrings with stringutil </s> remove aghstrings.WriteToBuilder(b, nl, vFmtGOARMHdr, "v", goarm) </s> add stringutil.WriteToBuilder(b, nl, vFmtGOARMHdr, "v", goarm) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtTimeHdr, buildtime) </s> add stringutil.WriteToBuilder(b, nl, vFmtTimeHdr, buildtime) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtGOMIPSHdr, gomips) </s> add stringutil.WriteToBuilder(b, nl, vFmtGOMIPSHdr, gomips) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtRaceHdr, strconv.FormatBool(isRace)) </s> add stringutil.WriteToBuilder(b, nl, vFmtRaceHdr, strconv.FormatBool(isRace)) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtDepsHdr) </s> add stringutil.WriteToBuilder(b, nl, vFmtDepsHdr)
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/63ee95dfbed2ee4320779dfca78f4cb5e4ad86e6
internal/version/version.go
stringutil.WriteToBuilder(b, nl, vFmtGOARMHdr, "v", goarm)
<mask> aghstrings.WriteToBuilder(b, nl, vFmtTimeHdr, buildtime) <mask> } <mask> aghstrings.WriteToBuilder(b, nl, vFmtGOOSHdr, nl, vFmtGOARCHHdr) <mask> if goarm != "" { <mask> aghstrings.WriteToBuilder(b, nl, vFmtGOARMHdr, "v", goarm) <mask> } else if gomips != "" { <mask> aghstrings.WriteToBuilder(b, nl, vFmtGOMIPSHdr, gomips) <mask> } <mask> aghstrings.WriteToBuilder(b, nl, vFmtRaceHdr, strconv.FormatBool(isRace)) <mask> </s> Pull request: all: replace aghstrings with stringutil Merge in DNS/adguard-home from add-stringutil to master Squashed commit of the following: commit 4ca9b29356de7d0a162b1e5a6496c691e9751f15 Author: Ainar Garipov <[email protected]> Date: Thu Jul 29 17:29:25 2021 +0300 all: replace aghstrings with stringutil </s> remove aghstrings.WriteToBuilder(b, nl, vFmtGOOSHdr, nl, vFmtGOARCHHdr) </s> add stringutil.WriteToBuilder(b, nl, vFmtGOOSHdr, nl, vFmtGOARCHHdr) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtGOMIPSHdr, gomips) </s> add stringutil.WriteToBuilder(b, nl, vFmtGOMIPSHdr, gomips) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtTimeHdr, buildtime) </s> add stringutil.WriteToBuilder(b, nl, vFmtTimeHdr, buildtime) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtRaceHdr, strconv.FormatBool(isRace)) </s> add stringutil.WriteToBuilder(b, nl, vFmtRaceHdr, strconv.FormatBool(isRace)) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtDepsHdr) </s> add stringutil.WriteToBuilder(b, nl, vFmtDepsHdr)
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/63ee95dfbed2ee4320779dfca78f4cb5e4ad86e6
internal/version/version.go
stringutil.WriteToBuilder(b, nl, vFmtGOMIPSHdr, gomips)
<mask> aghstrings.WriteToBuilder(b, nl, vFmtGOOSHdr, nl, vFmtGOARCHHdr) <mask> if goarm != "" { <mask> aghstrings.WriteToBuilder(b, nl, vFmtGOARMHdr, "v", goarm) <mask> } else if gomips != "" { <mask> aghstrings.WriteToBuilder(b, nl, vFmtGOMIPSHdr, gomips) <mask> } <mask> aghstrings.WriteToBuilder(b, nl, vFmtRaceHdr, strconv.FormatBool(isRace)) <mask> <mask> info, ok := debug.ReadBuildInfo() <mask> if !ok { </s> Pull request: all: replace aghstrings with stringutil Merge in DNS/adguard-home from add-stringutil to master Squashed commit of the following: commit 4ca9b29356de7d0a162b1e5a6496c691e9751f15 Author: Ainar Garipov <[email protected]> Date: Thu Jul 29 17:29:25 2021 +0300 all: replace aghstrings with stringutil </s> remove aghstrings.WriteToBuilder(b, nl, vFmtRaceHdr, strconv.FormatBool(isRace)) </s> add stringutil.WriteToBuilder(b, nl, vFmtRaceHdr, strconv.FormatBool(isRace)) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtGOARMHdr, "v", goarm) </s> add stringutil.WriteToBuilder(b, nl, vFmtGOARMHdr, "v", goarm) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtGOOSHdr, nl, vFmtGOARCHHdr) </s> add stringutil.WriteToBuilder(b, nl, vFmtGOOSHdr, nl, vFmtGOARCHHdr) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtTimeHdr, buildtime) </s> add stringutil.WriteToBuilder(b, nl, vFmtTimeHdr, buildtime) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtDepsHdr) </s> add stringutil.WriteToBuilder(b, nl, vFmtDepsHdr)
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/63ee95dfbed2ee4320779dfca78f4cb5e4ad86e6
internal/version/version.go
stringutil.WriteToBuilder(b, nl, vFmtRaceHdr, strconv.FormatBool(isRace))
<mask> aghstrings.WriteToBuilder(b, nl, vFmtGOARMHdr, "v", goarm) <mask> } else if gomips != "" { <mask> aghstrings.WriteToBuilder(b, nl, vFmtGOMIPSHdr, gomips) <mask> } <mask> aghstrings.WriteToBuilder(b, nl, vFmtRaceHdr, strconv.FormatBool(isRace)) <mask> <mask> info, ok := debug.ReadBuildInfo() <mask> if !ok { <mask> return b.String() <mask> } </s> Pull request: all: replace aghstrings with stringutil Merge in DNS/adguard-home from add-stringutil to master Squashed commit of the following: commit 4ca9b29356de7d0a162b1e5a6496c691e9751f15 Author: Ainar Garipov <[email protected]> Date: Thu Jul 29 17:29:25 2021 +0300 all: replace aghstrings with stringutil </s> remove aghstrings.WriteToBuilder(b, nl, vFmtGOMIPSHdr, gomips) </s> add stringutil.WriteToBuilder(b, nl, vFmtGOMIPSHdr, gomips) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtGOARMHdr, "v", goarm) </s> add stringutil.WriteToBuilder(b, nl, vFmtGOARMHdr, "v", goarm) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtGOOSHdr, nl, vFmtGOARCHHdr) </s> add stringutil.WriteToBuilder(b, nl, vFmtGOOSHdr, nl, vFmtGOARCHHdr) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtTimeHdr, buildtime) </s> add stringutil.WriteToBuilder(b, nl, vFmtTimeHdr, buildtime) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtDepsHdr) </s> add stringutil.WriteToBuilder(b, nl, vFmtDepsHdr)
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/63ee95dfbed2ee4320779dfca78f4cb5e4ad86e6
internal/version/version.go
stringutil.WriteToBuilder(b, nl, vFmtDepsHdr)
<mask> if len(info.Deps) == 0 { <mask> return b.String() <mask> } <mask> <mask> aghstrings.WriteToBuilder(b, nl, vFmtDepsHdr) <mask> for _, dep := range info.Deps { <mask> if depStr := fmtModule(dep); depStr != "" { <mask> aghstrings.WriteToBuilder(b, nltb, depStr) <mask> } <mask> } </s> Pull request: all: replace aghstrings with stringutil Merge in DNS/adguard-home from add-stringutil to master Squashed commit of the following: commit 4ca9b29356de7d0a162b1e5a6496c691e9751f15 Author: Ainar Garipov <[email protected]> Date: Thu Jul 29 17:29:25 2021 +0300 all: replace aghstrings with stringutil </s> remove aghstrings.WriteToBuilder(b, nltb, depStr) </s> add stringutil.WriteToBuilder(b, nltb, depStr) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtRaceHdr, strconv.FormatBool(isRace)) </s> add stringutil.WriteToBuilder(b, nl, vFmtRaceHdr, strconv.FormatBool(isRace)) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtGOMIPSHdr, gomips) </s> add stringutil.WriteToBuilder(b, nl, vFmtGOMIPSHdr, gomips) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtGOOSHdr, nl, vFmtGOARCHHdr) </s> add stringutil.WriteToBuilder(b, nl, vFmtGOOSHdr, nl, vFmtGOARCHHdr) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtGOARMHdr, "v", goarm) </s> add stringutil.WriteToBuilder(b, nl, vFmtGOARMHdr, "v", goarm)
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/63ee95dfbed2ee4320779dfca78f4cb5e4ad86e6
internal/version/version.go
stringutil.WriteToBuilder(b, nltb, depStr)
<mask> <mask> aghstrings.WriteToBuilder(b, nl, vFmtDepsHdr) <mask> for _, dep := range info.Deps { <mask> if depStr := fmtModule(dep); depStr != "" { <mask> aghstrings.WriteToBuilder(b, nltb, depStr) <mask> } <mask> } <mask> <mask> return b.String() <mask> } </s> Pull request: all: replace aghstrings with stringutil Merge in DNS/adguard-home from add-stringutil to master Squashed commit of the following: commit 4ca9b29356de7d0a162b1e5a6496c691e9751f15 Author: Ainar Garipov <[email protected]> Date: Thu Jul 29 17:29:25 2021 +0300 all: replace aghstrings with stringutil </s> remove aghstrings.WriteToBuilder(b, nl, vFmtDepsHdr) </s> add stringutil.WriteToBuilder(b, nl, vFmtDepsHdr) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtRaceHdr, strconv.FormatBool(isRace)) </s> add stringutil.WriteToBuilder(b, nl, vFmtRaceHdr, strconv.FormatBool(isRace)) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtGOMIPSHdr, gomips) </s> add stringutil.WriteToBuilder(b, nl, vFmtGOMIPSHdr, gomips) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtGOOSHdr, nl, vFmtGOARCHHdr) </s> add stringutil.WriteToBuilder(b, nl, vFmtGOOSHdr, nl, vFmtGOARCHHdr) </s> remove aghstrings.WriteToBuilder(b, nl, vFmtGOARMHdr, "v", goarm) </s> add stringutil.WriteToBuilder(b, nl, vFmtGOARMHdr, "v", goarm)
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/63ee95dfbed2ee4320779dfca78f4cb5e4ad86e6
internal/version/version.go
git grep -e 'TODO.*!!' -- ':!scripts/hooks/pre-commit' | cat || : verbose="${VERBOSE:-0}" readonly verbose
<mask> set -e -f -u <mask> <mask> # Show all temporary todos to the programmer but don't fail the commit <mask> # if there are any, because the commit could be in a temporary branch. <mask> git grep -e 'TODO.*!!' -- ':!HACKING.md' ':!scripts/hooks/pre-commit' | cat || : <mask> <mask> if [ "$( git diff --cached --name-only -- 'client/*.js' )" ] <mask> then <mask> make js-lint js-test <mask> fi </s> Pull request: all: replace aghstrings with stringutil Merge in DNS/adguard-home from add-stringutil to master Squashed commit of the following: commit 4ca9b29356de7d0a162b1e5a6496c691e9751f15 Author: Ainar Garipov <[email protected]> Date: Thu Jul 29 17:29:25 2021 +0300 all: replace aghstrings with stringutil </s> remove make js-lint js-test </s> add make VERBOSE="$verbose" js-lint js-test </s> remove make txt-lint </s> add make VERBOSE="$verbose" txt-lint </s> remove make go-os-check go-lint go-test </s> add make VERBOSE="$verbose" go-os-check go-lint go-test </s> remove make js-beta-lint js-beta-test </s> add make VERBOSE="$verbose" js-beta-lint js-beta-test </s> remove make openapi-lint </s> add make VERBOSE="$verbose" openapi-lint
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/63ee95dfbed2ee4320779dfca78f4cb5e4ad86e6
scripts/hooks/pre-commit
make VERBOSE="$verbose" js-lint js-test
<mask> git grep -e 'TODO.*!!' -- ':!HACKING.md' ':!scripts/hooks/pre-commit' | cat || : <mask> <mask> if [ "$( git diff --cached --name-only -- 'client/*.js' )" ] <mask> then <mask> make js-lint js-test <mask> fi <mask> <mask> if [ "$( git diff --cached --name-only -- 'client2/*.js' 'client2/*.ts' 'client2/*.tsx' )" ] <mask> then <mask> make js-beta-lint js-beta-test </s> Pull request: all: replace aghstrings with stringutil Merge in DNS/adguard-home from add-stringutil to master Squashed commit of the following: commit 4ca9b29356de7d0a162b1e5a6496c691e9751f15 Author: Ainar Garipov <[email protected]> Date: Thu Jul 29 17:29:25 2021 +0300 all: replace aghstrings with stringutil </s> remove make js-beta-lint js-beta-test </s> add make VERBOSE="$verbose" js-beta-lint js-beta-test </s> remove make txt-lint </s> add make VERBOSE="$verbose" txt-lint </s> remove git grep -e 'TODO.*!!' -- ':!HACKING.md' ':!scripts/hooks/pre-commit' | cat || : </s> add git grep -e 'TODO.*!!' -- ':!scripts/hooks/pre-commit' | cat || : verbose="${VERBOSE:-0}" readonly verbose </s> remove make go-os-check go-lint go-test </s> add make VERBOSE="$verbose" go-os-check go-lint go-test </s> remove make openapi-lint </s> add make VERBOSE="$verbose" openapi-lint
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/63ee95dfbed2ee4320779dfca78f4cb5e4ad86e6
scripts/hooks/pre-commit
make VERBOSE="$verbose" js-beta-lint js-beta-test
<mask> fi <mask> <mask> if [ "$( git diff --cached --name-only -- 'client2/*.js' 'client2/*.ts' 'client2/*.tsx' )" ] <mask> then <mask> make js-beta-lint js-beta-test <mask> fi <mask> <mask> if [ "$( git diff --cached --name-only -- '*.go' '*.mod' '*.sh' 'Makefile' )" ] <mask> then <mask> make go-os-check go-lint go-test </s> Pull request: all: replace aghstrings with stringutil Merge in DNS/adguard-home from add-stringutil to master Squashed commit of the following: commit 4ca9b29356de7d0a162b1e5a6496c691e9751f15 Author: Ainar Garipov <[email protected]> Date: Thu Jul 29 17:29:25 2021 +0300 all: replace aghstrings with stringutil </s> remove make go-os-check go-lint go-test </s> add make VERBOSE="$verbose" go-os-check go-lint go-test </s> remove make js-lint js-test </s> add make VERBOSE="$verbose" js-lint js-test </s> remove make txt-lint </s> add make VERBOSE="$verbose" txt-lint </s> remove make openapi-lint </s> add make VERBOSE="$verbose" openapi-lint </s> remove git grep -e 'TODO.*!!' -- ':!HACKING.md' ':!scripts/hooks/pre-commit' | cat || : </s> add git grep -e 'TODO.*!!' -- ':!scripts/hooks/pre-commit' | cat || : verbose="${VERBOSE:-0}" readonly verbose
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/63ee95dfbed2ee4320779dfca78f4cb5e4ad86e6
scripts/hooks/pre-commit
make VERBOSE="$verbose" go-os-check go-lint go-test
<mask> fi <mask> <mask> if [ "$( git diff --cached --name-only -- '*.go' '*.mod' '*.sh' 'Makefile' )" ] <mask> then <mask> make go-os-check go-lint go-test <mask> fi <mask> <mask> if [ "$( git diff --cached --name-only -- '*.md' '*.yaml' '*.yml' )" ] <mask> then <mask> make txt-lint </s> Pull request: all: replace aghstrings with stringutil Merge in DNS/adguard-home from add-stringutil to master Squashed commit of the following: commit 4ca9b29356de7d0a162b1e5a6496c691e9751f15 Author: Ainar Garipov <[email protected]> Date: Thu Jul 29 17:29:25 2021 +0300 all: replace aghstrings with stringutil </s> remove make js-beta-lint js-beta-test </s> add make VERBOSE="$verbose" js-beta-lint js-beta-test </s> remove make txt-lint </s> add make VERBOSE="$verbose" txt-lint </s> remove make openapi-lint </s> add make VERBOSE="$verbose" openapi-lint </s> remove make js-lint js-test </s> add make VERBOSE="$verbose" js-lint js-test </s> remove git grep -e 'TODO.*!!' -- ':!HACKING.md' ':!scripts/hooks/pre-commit' | cat || : </s> add git grep -e 'TODO.*!!' -- ':!scripts/hooks/pre-commit' | cat || : verbose="${VERBOSE:-0}" readonly verbose
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/63ee95dfbed2ee4320779dfca78f4cb5e4ad86e6
scripts/hooks/pre-commit
make VERBOSE="$verbose" txt-lint
<mask> fi <mask> <mask> if [ "$( git diff --cached --name-only -- '*.md' '*.yaml' '*.yml' )" ] <mask> then <mask> make txt-lint <mask> fi <mask> <mask> if [ "$( git diff --cached --name-only -- './openapi/openapi.yaml' )" ] <mask> then <mask> make openapi-lint </s> Pull request: all: replace aghstrings with stringutil Merge in DNS/adguard-home from add-stringutil to master Squashed commit of the following: commit 4ca9b29356de7d0a162b1e5a6496c691e9751f15 Author: Ainar Garipov <[email protected]> Date: Thu Jul 29 17:29:25 2021 +0300 all: replace aghstrings with stringutil </s> remove make go-os-check go-lint go-test </s> add make VERBOSE="$verbose" go-os-check go-lint go-test </s> remove make openapi-lint </s> add make VERBOSE="$verbose" openapi-lint </s> remove make js-beta-lint js-beta-test </s> add make VERBOSE="$verbose" js-beta-lint js-beta-test </s> remove make js-lint js-test </s> add make VERBOSE="$verbose" js-lint js-test </s> remove git grep -e 'TODO.*!!' -- ':!HACKING.md' ':!scripts/hooks/pre-commit' | cat || : </s> add git grep -e 'TODO.*!!' -- ':!scripts/hooks/pre-commit' | cat || : verbose="${VERBOSE:-0}" readonly verbose
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/63ee95dfbed2ee4320779dfca78f4cb5e4ad86e6
scripts/hooks/pre-commit
make VERBOSE="$verbose" openapi-lint
<mask> fi <mask> <mask> if [ "$( git diff --cached --name-only -- './openapi/openapi.yaml' )" ] <mask> then <mask> make openapi-lint <mask> fi </s> Pull request: all: replace aghstrings with stringutil Merge in DNS/adguard-home from add-stringutil to master Squashed commit of the following: commit 4ca9b29356de7d0a162b1e5a6496c691e9751f15 Author: Ainar Garipov <[email protected]> Date: Thu Jul 29 17:29:25 2021 +0300 all: replace aghstrings with stringutil </s> remove make txt-lint </s> add make VERBOSE="$verbose" txt-lint </s> remove make go-os-check go-lint go-test </s> add make VERBOSE="$verbose" go-os-check go-lint go-test </s> remove make js-beta-lint js-beta-test </s> add make VERBOSE="$verbose" js-beta-lint js-beta-test </s> remove make js-lint js-test </s> add make VERBOSE="$verbose" js-lint js-test </s> remove git grep -e 'TODO.*!!' -- ':!HACKING.md' ':!scripts/hooks/pre-commit' | cat || : </s> add git grep -e 'TODO.*!!' -- ':!scripts/hooks/pre-commit' | cat || : verbose="${VERBOSE:-0}" readonly verbose
[ "keep", "keep", "keep", "keep", "replace", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/63ee95dfbed2ee4320779dfca78f4cb5e4ad86e6
scripts/hooks/pre-commit
"github.com/AdguardTeam/AdGuardHome/internal/sysutil"
<mask> "strings" <mask> "syscall" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/update" <mask> "github.com/AdguardTeam/golibs/log" <mask> ) <mask> <mask> type getVersionJSONRequest struct { <mask> RecheckNow bool `json:"recheck_now"` </s> Pull request: 2231 autoupdate Merge in DNS/adguard-home from 2231-autoupdate to master Updates #2231. Squashed commit of the following: commit 4ee9148ee7a38f2759898302a2109aa982fb4ee9 Author: Eugene Burkov <[email protected]> Date: Mon Nov 30 19:08:14 2020 +0300 sysutil: provide os-independent interface commit 778097c5fdeb1dec94f4cfc6443d08f92d9db0ba Author: Eugene Burkov <[email protected]> Date: Mon Nov 30 16:40:33 2020 +0300 all: add sysutil package </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util" </s> add </s> remove err := util.ConfigureSyslog(serviceName) </s> add err := sysutil.ConfigureSyslog(serviceName) </s> remove util.SetRlimit(config.RlimitNoFile) </s> add sysutil.SetRlimit(config.RlimitNoFile)
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/641db73a86a6d9d047f47c403bca70af320f23e9
internal/home/control_update.go
<mask> "strings" <mask> "syscall" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/update" <mask> "github.com/AdguardTeam/AdGuardHome/internal/util" <mask> "github.com/AdguardTeam/golibs/log" <mask> ) <mask> <mask> type getVersionJSONRequest struct { <mask> RecheckNow bool `json:"recheck_now"` </s> Pull request: 2231 autoupdate Merge in DNS/adguard-home from 2231-autoupdate to master Updates #2231. Squashed commit of the following: commit 4ee9148ee7a38f2759898302a2109aa982fb4ee9 Author: Eugene Burkov <[email protected]> Date: Mon Nov 30 19:08:14 2020 +0300 sysutil: provide os-independent interface commit 778097c5fdeb1dec94f4cfc6443d08f92d9db0ba Author: Eugene Burkov <[email protected]> Date: Mon Nov 30 16:40:33 2020 +0300 all: add sysutil package </s> remove err := util.ConfigureSyslog(serviceName) </s> add err := sysutil.ConfigureSyslog(serviceName) </s> remove util.SetRlimit(config.RlimitNoFile) </s> add sysutil.SetRlimit(config.RlimitNoFile)
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/641db73a86a6d9d047f47c403bca70af320f23e9
internal/home/control_update.go
canUpdate, _ = sysutil.CanBindPrivilegedPorts()
<mask> tlsConf.PortDNSOverTLS < 1024 || <mask> tlsConf.PortDNSOverQUIC < 1024)) || <mask> config.BindPort < 1024 || <mask> config.DNS.Port < 1024) { <mask> // On UNIX, if we're running under a regular user, <mask> // but with CAP_NET_BIND_SERVICE set on a binary file, <mask> // and we're listening on ports <1024, <mask> // we won't be able to restart after we replace the binary file, <mask> // because we'll lose CAP_NET_BIND_SERVICE capability. <mask> canUpdate, _ = util.HaveAdminRights() <mask> } <mask> ret["can_autoupdate"] = canUpdate <mask> } <mask> <mask> d, _ := json.Marshal(ret) </s> Pull request: 2231 autoupdate Merge in DNS/adguard-home from 2231-autoupdate to master Updates #2231. Squashed commit of the following: commit 4ee9148ee7a38f2759898302a2109aa982fb4ee9 Author: Eugene Burkov <[email protected]> Date: Mon Nov 30 19:08:14 2020 +0300 sysutil: provide os-independent interface commit 778097c5fdeb1dec94f4cfc6443d08f92d9db0ba Author: Eugene Burkov <[email protected]> Date: Mon Nov 30 16:40:33 2020 +0300 all: add sysutil package </s> remove admin, _ := util.HaveAdminRights() </s> add admin, _ := sysutil.HaveAdminRights() </s> remove util.SetRlimit(config.RlimitNoFile) </s> add sysutil.SetRlimit(config.RlimitNoFile) </s> remove err := util.ConfigureSyslog(serviceName) </s> add err := sysutil.ConfigureSyslog(serviceName) </s> remove err = util.SendProcessSignal(pid, syscall.SIGHUP) </s> add err = sysutil.SendProcessSignal(pid, syscall.SIGHUP) </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util" </s> add
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/641db73a86a6d9d047f47c403bca70af320f23e9
internal/home/control_update.go
"github.com/AdguardTeam/AdGuardHome/internal/sysutil"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward" <mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog" <mask> "github.com/AdguardTeam/AdGuardHome/internal/stats" <mask> "github.com/AdguardTeam/AdGuardHome/internal/update" <mask> "github.com/AdguardTeam/AdGuardHome/internal/util" <mask> "github.com/AdguardTeam/golibs/log" <mask> "gopkg.in/natefinch/lumberjack.v2" <mask> ) <mask> </s> Pull request: 2231 autoupdate Merge in DNS/adguard-home from 2231-autoupdate to master Updates #2231. Squashed commit of the following: commit 4ee9148ee7a38f2759898302a2109aa982fb4ee9 Author: Eugene Burkov <[email protected]> Date: Mon Nov 30 19:08:14 2020 +0300 sysutil: provide os-independent interface commit 778097c5fdeb1dec94f4cfc6443d08f92d9db0ba Author: Eugene Burkov <[email protected]> Date: Mon Nov 30 16:40:33 2020 +0300 all: add sysutil package </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util" </s> add </s> remove err = util.SendProcessSignal(pid, syscall.SIGHUP) </s> add err = sysutil.SendProcessSignal(pid, syscall.SIGHUP) </s> remove err := util.ConfigureSyslog(serviceName) </s> add err := sysutil.ConfigureSyslog(serviceName)
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/641db73a86a6d9d047f47c403bca70af320f23e9
internal/home/home.go
sysutil.SetRlimit(config.RlimitNoFile)
<mask> config.Clients = nil <mask> <mask> if (runtime.GOOS == "linux" || runtime.GOOS == "darwin") && <mask> config.RlimitNoFile != 0 { <mask> util.SetRlimit(config.RlimitNoFile) <mask> } <mask> <mask> // override bind host/port from the console <mask> if args.bindHost != "" { <mask> config.BindHost = args.bindHost </s> Pull request: 2231 autoupdate Merge in DNS/adguard-home from 2231-autoupdate to master Updates #2231. Squashed commit of the following: commit 4ee9148ee7a38f2759898302a2109aa982fb4ee9 Author: Eugene Burkov <[email protected]> Date: Mon Nov 30 19:08:14 2020 +0300 sysutil: provide os-independent interface commit 778097c5fdeb1dec94f4cfc6443d08f92d9db0ba Author: Eugene Burkov <[email protected]> Date: Mon Nov 30 16:40:33 2020 +0300 all: add sysutil package </s> remove err = util.SendProcessSignal(pid, syscall.SIGHUP) </s> add err = sysutil.SendProcessSignal(pid, syscall.SIGHUP) </s> remove err := util.ConfigureSyslog(serviceName) </s> add err := sysutil.ConfigureSyslog(serviceName) </s> remove admin, _ := util.HaveAdminRights() </s> add admin, _ := sysutil.HaveAdminRights() </s> remove // On UNIX, if we're running under a regular user, // but with CAP_NET_BIND_SERVICE set on a binary file, // and we're listening on ports <1024, // we won't be able to restart after we replace the binary file, // because we'll lose CAP_NET_BIND_SERVICE capability. canUpdate, _ = util.HaveAdminRights() </s> add canUpdate, _ = sysutil.CanBindPrivilegedPorts() </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util" </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/641db73a86a6d9d047f47c403bca70af320f23e9
internal/home/home.go
admin, _ := sysutil.HaveAdminRights()
<mask> <mask> if runtime.GOOS == "windows" { <mask> // On Windows we need to have admin rights to run properly <mask> <mask> admin, _ := util.HaveAdminRights() <mask> if admin { <mask> return <mask> } <mask> <mask> log.Fatal("This is the first launch of AdGuard Home. You must run it as Administrator.") </s> Pull request: 2231 autoupdate Merge in DNS/adguard-home from 2231-autoupdate to master Updates #2231. Squashed commit of the following: commit 4ee9148ee7a38f2759898302a2109aa982fb4ee9 Author: Eugene Burkov <[email protected]> Date: Mon Nov 30 19:08:14 2020 +0300 sysutil: provide os-independent interface commit 778097c5fdeb1dec94f4cfc6443d08f92d9db0ba Author: Eugene Burkov <[email protected]> Date: Mon Nov 30 16:40:33 2020 +0300 all: add sysutil package </s> remove err := util.ConfigureSyslog(serviceName) </s> add err := sysutil.ConfigureSyslog(serviceName) </s> remove // On UNIX, if we're running under a regular user, // but with CAP_NET_BIND_SERVICE set on a binary file, // and we're listening on ports <1024, // we won't be able to restart after we replace the binary file, // because we'll lose CAP_NET_BIND_SERVICE capability. canUpdate, _ = util.HaveAdminRights() </s> add canUpdate, _ = sysutil.CanBindPrivilegedPorts() </s> remove err = util.SendProcessSignal(pid, syscall.SIGHUP) </s> add err = sysutil.SendProcessSignal(pid, syscall.SIGHUP) </s> remove util.SetRlimit(config.RlimitNoFile) </s> add sysutil.SetRlimit(config.RlimitNoFile) </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util" </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/641db73a86a6d9d047f47c403bca70af320f23e9
internal/home/home.go
err := sysutil.ConfigureSyslog(serviceName)
<mask> } <mask> <mask> if ls.LogFile == configSyslog { <mask> // Use syslog where it is possible and eventlog on Windows <mask> err := util.ConfigureSyslog(serviceName) <mask> if err != nil { <mask> log.Fatalf("cannot initialize syslog: %s", err) <mask> } <mask> } else { <mask> logFilePath := filepath.Join(Context.workDir, ls.LogFile) </s> Pull request: 2231 autoupdate Merge in DNS/adguard-home from 2231-autoupdate to master Updates #2231. Squashed commit of the following: commit 4ee9148ee7a38f2759898302a2109aa982fb4ee9 Author: Eugene Burkov <[email protected]> Date: Mon Nov 30 19:08:14 2020 +0300 sysutil: provide os-independent interface commit 778097c5fdeb1dec94f4cfc6443d08f92d9db0ba Author: Eugene Burkov <[email protected]> Date: Mon Nov 30 16:40:33 2020 +0300 all: add sysutil package </s> remove err = util.SendProcessSignal(pid, syscall.SIGHUP) </s> add err = sysutil.SendProcessSignal(pid, syscall.SIGHUP) </s> remove admin, _ := util.HaveAdminRights() </s> add admin, _ := sysutil.HaveAdminRights() </s> remove util.SetRlimit(config.RlimitNoFile) </s> add sysutil.SetRlimit(config.RlimitNoFile) </s> remove // On UNIX, if we're running under a regular user, // but with CAP_NET_BIND_SERVICE set on a binary file, // and we're listening on ports <1024, // we won't be able to restart after we replace the binary file, // because we'll lose CAP_NET_BIND_SERVICE capability. canUpdate, _ = util.HaveAdminRights() </s> add canUpdate, _ = sysutil.CanBindPrivilegedPorts() </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util" </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/641db73a86a6d9d047f47c403bca70af320f23e9
internal/home/home.go
"github.com/AdguardTeam/AdGuardHome/internal/sysutil"
<mask> "strings" <mask> "syscall" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/util" <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/kardianos/service" <mask> ) </s> Pull request: 2231 autoupdate Merge in DNS/adguard-home from 2231-autoupdate to master Updates #2231. Squashed commit of the following: commit 4ee9148ee7a38f2759898302a2109aa982fb4ee9 Author: Eugene Burkov <[email protected]> Date: Mon Nov 30 19:08:14 2020 +0300 sysutil: provide os-independent interface commit 778097c5fdeb1dec94f4cfc6443d08f92d9db0ba Author: Eugene Burkov <[email protected]> Date: Mon Nov 30 16:40:33 2020 +0300 all: add sysutil package </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util" </s> add </s> remove err = util.SendProcessSignal(pid, syscall.SIGHUP) </s> add err = sysutil.SendProcessSignal(pid, syscall.SIGHUP) </s> remove err := util.ConfigureSyslog(serviceName) </s> add err := sysutil.ConfigureSyslog(serviceName)
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/641db73a86a6d9d047f47c403bca70af320f23e9
internal/home/service.go
err = sysutil.SendProcessSignal(pid, syscall.SIGHUP)
<mask> if err != nil { <mask> log.Error("Can't read PID file %s: %s", pidfile, err) <mask> return <mask> } <mask> err = util.SendProcessSignal(pid, syscall.SIGHUP) <mask> if err != nil { <mask> log.Error("Can't send signal to PID %d: %s", pid, err) <mask> return <mask> } <mask> log.Debug("Sent signal to PID %d", pid) </s> Pull request: 2231 autoupdate Merge in DNS/adguard-home from 2231-autoupdate to master Updates #2231. Squashed commit of the following: commit 4ee9148ee7a38f2759898302a2109aa982fb4ee9 Author: Eugene Burkov <[email protected]> Date: Mon Nov 30 19:08:14 2020 +0300 sysutil: provide os-independent interface commit 778097c5fdeb1dec94f4cfc6443d08f92d9db0ba Author: Eugene Burkov <[email protected]> Date: Mon Nov 30 16:40:33 2020 +0300 all: add sysutil package </s> remove err := util.ConfigureSyslog(serviceName) </s> add err := sysutil.ConfigureSyslog(serviceName) </s> remove util.SetRlimit(config.RlimitNoFile) </s> add sysutil.SetRlimit(config.RlimitNoFile) </s> remove admin, _ := util.HaveAdminRights() </s> add admin, _ := sysutil.HaveAdminRights() </s> remove // On UNIX, if we're running under a regular user, // but with CAP_NET_BIND_SERVICE set on a binary file, // and we're listening on ports <1024, // we won't be able to restart after we replace the binary file, // because we'll lose CAP_NET_BIND_SERVICE capability. canUpdate, _ = util.HaveAdminRights() </s> add canUpdate, _ = sysutil.CanBindPrivilegedPorts() </s> remove "github.com/AdguardTeam/AdGuardHome/internal/util" </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/641db73a86a6d9d047f47c403bca70af320f23e9
internal/home/service.go
VERBOSE := -v
<mask> GPG_KEY := [email protected] <mask> GPG_KEY_PASSPHRASE := <mask> GPG_CMD := gpg --detach-sig --default-key $(GPG_KEY) --pinentry-mode loopback --passphrase $(GPG_KEY_PASSPHRASE) <mask> <mask> # See release target <mask> DIST_DIR=dist <mask> </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove TEST_FLAGS := --race -v </s> add TEST_FLAGS := --race $(VERBOSE) </s> remove # make build output rm -f AdGuardHome rm -f AdGuardHome.exe # tests output rm -rf data rm -f coverage.txt # static build output rm -rf build # dist folder rm -rf $(DIST_DIR) # client deps rm -rf client/node_modules # packr-generated files PATH=$(GOPATH)/bin:$(PATH) packr clean || true </s> add rm -f ./AdGuardHome ./AdGuardHome.exe ./coverage.txt rm -f -r ./build/ ./client/node_modules/ ./data/ $(DIST_DIR) # Set the GOPATH explicitly in case make clean is called from under sudo # after a Docker build. env PATH="$(GOPATH)/bin:$$PATH" packr clean
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
Makefile
TEST_FLAGS := --race $(VERBOSE)
<mask> $(error DOCKER_IMAGE_NAME value is not set) <mask> endif <mask> <mask> # OS-specific flags <mask> TEST_FLAGS := --race -v <mask> ifeq ($(OS),Windows_NT) <mask> TEST_FLAGS := <mask> endif <mask> <mask> .PHONY: all build client client-watch docker lint lint-js lint-go test dependencies clean release docker-multi-arch </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove # make build output rm -f AdGuardHome rm -f AdGuardHome.exe # tests output rm -rf data rm -f coverage.txt # static build output rm -rf build # dist folder rm -rf $(DIST_DIR) # client deps rm -rf client/node_modules # packr-generated files PATH=$(GOPATH)/bin:$(PATH) packr clean || true </s> add rm -f ./AdGuardHome ./AdGuardHome.exe ./coverage.txt rm -f -r ./build/ ./client/node_modules/ ./data/ $(DIST_DIR) # Set the GOPATH explicitly in case make clean is called from under sudo # after a Docker build. env PATH="$(GOPATH)/bin:$$PATH" packr clean </s> remove pinger.Run() </s> add err = pinger.Run() if err != nil { log.Error("pinger.Run(): %v", err) return true }
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
Makefile
rm -f ./AdGuardHome ./AdGuardHome.exe ./coverage.txt rm -f -r ./build/ ./client/node_modules/ ./data/ $(DIST_DIR) # Set the GOPATH explicitly in case make clean is called from under sudo # after a Docker build. env PATH="$(GOPATH)/bin:$$PATH" packr clean
<mask> npm --prefix client ci <mask> go mod download <mask> <mask> clean: <mask> # make build output <mask> rm -f AdGuardHome <mask> rm -f AdGuardHome.exe <mask> # tests output <mask> rm -rf data <mask> rm -f coverage.txt <mask> # static build output <mask> rm -rf build <mask> # dist folder <mask> rm -rf $(DIST_DIR) <mask> # client deps <mask> rm -rf client/node_modules <mask> # packr-generated files <mask> PATH=$(GOPATH)/bin:$(PATH) packr clean || true <mask> <mask> docker-multi-arch: <mask> DOCKER_CLI_EXPERIMENTAL=enabled \ <mask> docker buildx build \ <mask> --platform $(DOCKER_PLATFORMS) \ </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove TEST_FLAGS := --race -v </s> add TEST_FLAGS := --race $(VERBOSE) </s> remove pinger.Run() </s> add err = pinger.Run() if err != nil { log.Error("pinger.Run(): %v", err) return true }
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
Makefile
github.com/go-ping/ping v0.0.0-20201115131931-3300c582a663 github.com/gobuffalo/envy v1.9.0 // indirect
<mask> github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 // indirect <mask> github.com/fsnotify/fsnotify v1.4.9 <mask> github.com/gobuffalo/packr v1.30.1 <mask> github.com/gobuffalo/packr/v2 v2.8.1 // indirect <mask> github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 <mask> github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8 <mask> github.com/joomcode/errorx v1.0.3 // indirect <mask> github.com/kardianos/service v1.2.0 </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 </s> add github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8 </s> remove github.com/kardianos/service v1.1.0 </s> add github.com/kardianos/service v1.2.0 github.com/karrick/godirwalk v1.16.1 // indirect github.com/lucas-clemente/quic-go v0.19.1 // indirect </s> remove github.com/rogpeppe/go-internal v1.5.2 // indirect </s> add github.com/rogpeppe/go-internal v1.6.2 // indirect </s> remove github.com/sirupsen/logrus v1.6.0 // indirect github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c </s> add github.com/sirupsen/logrus v1.7.0 // indirect github.com/spf13/cobra v1.1.1 // indirect
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.mod
github.com/gobuffalo/packr/v2 v2.8.1 // indirect
<mask> github.com/gobuffalo/envy v1.9.0 // indirect <mask> github.com/gobuffalo/packr v1.30.1 <mask> github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 <mask> github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8 <mask> github.com/joomcode/errorx v1.0.3 // indirect <mask> github.com/kardianos/service v1.2.0 <mask> github.com/karrick/godirwalk v1.16.1 // indirect </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/kardianos/service v1.1.0 </s> add github.com/kardianos/service v1.2.0 github.com/karrick/godirwalk v1.16.1 // indirect github.com/lucas-clemente/quic-go v0.19.1 // indirect </s> remove github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 </s> add github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8 </s> remove github.com/rogpeppe/go-internal v1.5.2 // indirect </s> add github.com/rogpeppe/go-internal v1.6.2 // indirect </s> remove github.com/sirupsen/logrus v1.6.0 // indirect github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c </s> add github.com/sirupsen/logrus v1.7.0 // indirect github.com/spf13/cobra v1.1.1 // indirect
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.mod
github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8
<mask> github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 // indirect <mask> github.com/fsnotify/fsnotify v1.4.9 <mask> github.com/gobuffalo/packr v1.30.1 <mask> github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 <mask> github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 <mask> github.com/joomcode/errorx v1.0.3 // indirect <mask> github.com/kardianos/service v1.1.0 <mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 <mask> github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 <mask> github.com/miekg/dns v1.1.35 </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/kardianos/service v1.1.0 </s> add github.com/kardianos/service v1.2.0 github.com/karrick/godirwalk v1.16.1 // indirect github.com/lucas-clemente/quic-go v0.19.1 // indirect </s> remove github.com/rogpeppe/go-internal v1.5.2 // indirect </s> add github.com/rogpeppe/go-internal v1.6.2 // indirect </s> remove github.com/sirupsen/logrus v1.6.0 // indirect github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c </s> add github.com/sirupsen/logrus v1.7.0 // indirect github.com/spf13/cobra v1.1.1 // indirect
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.mod
github.com/kardianos/service v1.2.0 github.com/karrick/godirwalk v1.16.1 // indirect github.com/lucas-clemente/quic-go v0.19.1 // indirect
<mask> github.com/gobuffalo/packr v1.30.1 <mask> github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 <mask> github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 <mask> github.com/joomcode/errorx v1.0.3 // indirect <mask> github.com/kardianos/service v1.1.0 <mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 <mask> github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 <mask> github.com/miekg/dns v1.1.35 <mask> github.com/rogpeppe/go-internal v1.5.2 // indirect <mask> github.com/satori/go.uuid v1.2.0 </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 </s> add github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8 </s> remove github.com/rogpeppe/go-internal v1.5.2 // indirect </s> add github.com/rogpeppe/go-internal v1.6.2 // indirect </s> remove github.com/sirupsen/logrus v1.6.0 // indirect github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c </s> add github.com/sirupsen/logrus v1.7.0 // indirect github.com/spf13/cobra v1.1.1 // indirect
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.mod
github.com/rogpeppe/go-internal v1.6.2 // indirect
<mask> github.com/kardianos/service v1.1.0 <mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 <mask> github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 <mask> github.com/miekg/dns v1.1.35 <mask> github.com/rogpeppe/go-internal v1.5.2 // indirect <mask> github.com/satori/go.uuid v1.2.0 <mask> github.com/sirupsen/logrus v1.6.0 // indirect <mask> github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c <mask> github.com/stretchr/testify v1.6.1 <mask> github.com/u-root/u-root v6.0.0+incompatible </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/sirupsen/logrus v1.6.0 // indirect github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c </s> add github.com/sirupsen/logrus v1.7.0 // indirect github.com/spf13/cobra v1.1.1 // indirect </s> remove github.com/kardianos/service v1.1.0 </s> add github.com/kardianos/service v1.2.0 github.com/karrick/godirwalk v1.16.1 // indirect github.com/lucas-clemente/quic-go v0.19.1 // indirect </s> remove github.com/u-root/u-root v6.0.0+incompatible go.etcd.io/bbolt v1.3.4 golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 </s> add github.com/u-root/u-root v7.0.0+incompatible go.etcd.io/bbolt v1.3.5 golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 </s> remove github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 </s> add github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.mod
github.com/sirupsen/logrus v1.7.0 // indirect github.com/spf13/cobra v1.1.1 // indirect
<mask> github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 <mask> github.com/miekg/dns v1.1.35 <mask> github.com/rogpeppe/go-internal v1.5.2 // indirect <mask> github.com/satori/go.uuid v1.2.0 <mask> github.com/sirupsen/logrus v1.6.0 // indirect <mask> github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c <mask> github.com/stretchr/testify v1.6.1 <mask> github.com/u-root/u-root v6.0.0+incompatible <mask> go.etcd.io/bbolt v1.3.4 <mask> golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 <mask> golang.org/x/net v0.0.0-20201110031124-69a78807bb2b </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/rogpeppe/go-internal v1.5.2 // indirect </s> add github.com/rogpeppe/go-internal v1.6.2 // indirect </s> remove github.com/u-root/u-root v6.0.0+incompatible go.etcd.io/bbolt v1.3.4 golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 </s> add github.com/u-root/u-root v7.0.0+incompatible go.etcd.io/bbolt v1.3.5 golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 </s> remove github.com/kardianos/service v1.1.0 </s> add github.com/kardianos/service v1.2.0 github.com/karrick/godirwalk v1.16.1 // indirect github.com/lucas-clemente/quic-go v0.19.1 // indirect </s> remove golang.org/x/sys v0.0.0-20201109165425-215b40eba54c </s> add golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 </s> remove github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 </s> add github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.mod
github.com/u-root/u-root v7.0.0+incompatible go.etcd.io/bbolt v1.3.5 golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9
<mask> github.com/satori/go.uuid v1.2.0 <mask> github.com/sirupsen/logrus v1.6.0 // indirect <mask> github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c <mask> github.com/stretchr/testify v1.6.1 <mask> github.com/u-root/u-root v6.0.0+incompatible <mask> go.etcd.io/bbolt v1.3.4 <mask> golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 <mask> golang.org/x/net v0.0.0-20201110031124-69a78807bb2b <mask> golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect <mask> golang.org/x/sys v0.0.0-20201109165425-215b40eba54c <mask> golang.org/x/text v0.3.4 // indirect <mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/sirupsen/logrus v1.6.0 // indirect github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c </s> add github.com/sirupsen/logrus v1.7.0 // indirect github.com/spf13/cobra v1.1.1 // indirect </s> remove golang.org/x/sys v0.0.0-20201109165425-215b40eba54c </s> add golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 </s> remove github.com/rogpeppe/go-internal v1.5.2 // indirect </s> add github.com/rogpeppe/go-internal v1.6.2 // indirect </s> remove howett.net/plist v0.0.0-20200419221736-3b63eb3a43b5 </s> add howett.net/plist v0.0.0-20201026045517-117a925f2150 </s> remove github.com/kardianos/service v1.1.0 </s> add github.com/kardianos/service v1.2.0 github.com/karrick/godirwalk v1.16.1 // indirect github.com/lucas-clemente/quic-go v0.19.1 // indirect
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.mod
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68
<mask> go.etcd.io/bbolt v1.3.4 <mask> golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 <mask> golang.org/x/net v0.0.0-20201110031124-69a78807bb2b <mask> golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect <mask> golang.org/x/sys v0.0.0-20201109165425-215b40eba54c <mask> golang.org/x/text v0.3.4 // indirect <mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect <mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0 <mask> gopkg.in/yaml.v2 v2.3.0 <mask> gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/u-root/u-root v6.0.0+incompatible go.etcd.io/bbolt v1.3.4 golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 </s> add github.com/u-root/u-root v7.0.0+incompatible go.etcd.io/bbolt v1.3.5 golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 </s> remove howett.net/plist v0.0.0-20200419221736-3b63eb3a43b5 </s> add howett.net/plist v0.0.0-20201026045517-117a925f2150 </s> remove github.com/sirupsen/logrus v1.6.0 // indirect github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c </s> add github.com/sirupsen/logrus v1.7.0 // indirect github.com/spf13/cobra v1.1.1 // indirect
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.mod
howett.net/plist v0.0.0-20201026045517-117a925f2150
<mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect <mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0 <mask> gopkg.in/yaml.v2 v2.3.0 <mask> gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect <mask> howett.net/plist v0.0.0-20200419221736-3b63eb3a43b5 <mask> ) </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove golang.org/x/sys v0.0.0-20201109165425-215b40eba54c </s> add golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 </s> remove github.com/u-root/u-root v6.0.0+incompatible go.etcd.io/bbolt v1.3.4 golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 </s> add github.com/u-root/u-root v7.0.0+incompatible go.etcd.io/bbolt v1.3.5 golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 </s> remove github.com/kardianos/service v1.1.0 </s> add github.com/kardianos/service v1.2.0 github.com/karrick/godirwalk v1.16.1 // indirect github.com/lucas-clemente/quic-go v0.19.1 // indirect
[ "keep", "keep", "keep", "keep", "replace", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.mod
cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
<mask> cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= <mask> cloud.google.com/go v0.37.0/go.mod h1:TS1dMSSfndXH133OKGwekG838Om/cQT0BUHV3HcBgoo= <mask> dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl+fi1br7+Rr3LqpNJf1/uxUdtRUV+Tnj0o93V2B9MU= <mask> dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= <mask> dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU= <mask> dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4= <mask> dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= <mask> git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove pinger.Run() </s> add err = pinger.Run() if err != nil { log.Error("pinger.Run(): %v", err) return true }
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
<mask> cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= <mask> cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= <mask> cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= <mask> dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl+fi1br7+Rr3LqpNJf1/uxUdtRUV+Tnj0o93V2B9MU= <mask> dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU= <mask> dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4= <mask> dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= <mask> git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= <mask> github.com/AdguardTeam/dnsproxy v0.33.2 h1:k5aMcsw3TA/G2DR8EjIkwutDPuuRkKh8xij4cFWC6Fk= <mask> github.com/AdguardTeam/dnsproxy v0.33.2/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
<mask> github.com/AdguardTeam/urlfilter v0.12.3/go.mod h1:1fcCQx5TGJANrQN6sHNNM9KPBl7qx7BJml45ko6vru0= <mask> github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= <mask> github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= <mask> github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I= <mask> github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= <mask> github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= <mask> github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk= <mask> github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= <mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
<mask> github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= <mask> github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= <mask> github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I= <mask> github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= <mask> github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk= <mask> github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= <mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY= <mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA= <mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 h1:52m0LGchQBBVqJRyYYufQuIbVqRawmubW3OFGqK1ekw= <mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635/go.mod h1:lmLxL+FV291OopO93Bwf9fQLQeLyt33VJRUg5VJ30us= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA= <mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 h1:52m0LGchQBBVqJRyYYufQuIbVqRawmubW3OFGqK1ekw= <mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635/go.mod h1:lmLxL+FV291OopO93Bwf9fQLQeLyt33VJRUg5VJ30us= <mask> github.com/ameshkov/dnscrypt/v2 v2.0.0 h1:i83G8MeGLrAFgUL8GSu98TVhtFDEifF7SIS7Qi/RZ3U= <mask> github.com/ameshkov/dnscrypt/v2 v2.0.0/go.mod h1:nbZnxJt4edIPx2Haa8n2XtC2g5AWcsdQiSuXkNH8eDI= <mask> github.com/ameshkov/dnsstamps v1.0.1 h1:LhGvgWDzhNJh+kBQd/AfUlq1vfVe109huiXw4JhnPug= <mask> github.com/ameshkov/dnsstamps v1.0.1/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
<mask> github.com/ameshkov/dnsstamps v1.0.1/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A= <mask> github.com/ameshkov/dnsstamps v1.0.3 h1:Srzik+J9mivH1alRACTbys2xOxs0lRH9qnTA7Y1OYVo= <mask> github.com/ameshkov/dnsstamps v1.0.3/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A= <mask> github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= <mask> github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= <mask> github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= <mask> github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= <mask> github.com/beefsack/go-rate v0.0.0-20180408011153-efa7637bb9b6 h1:KXlsf+qt/X5ttPGEjR0tPH1xaWWoKBEg9Q1THAj2h3I= <mask> github.com/beefsack/go-rate v0.0.0-20180408011153-efa7637bb9b6/go.mod h1:6YNgTHLutezwnBvyneBbwvB8C82y3dcoOj5EQJIdGXA= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 </s> add github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
<mask> github.com/ameshkov/dnsstamps v1.0.3/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A= <mask> github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= <mask> github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= <mask> github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= <mask> github.com/beefsack/go-rate v0.0.0-20180408011153-efa7637bb9b6 h1:KXlsf+qt/X5ttPGEjR0tPH1xaWWoKBEg9Q1THAj2h3I= <mask> github.com/beefsack/go-rate v0.0.0-20180408011153-efa7637bb9b6/go.mod h1:6YNgTHLutezwnBvyneBbwvB8C82y3dcoOj5EQJIdGXA= <mask> github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 h1:M57m0xQqZIhx7CEJgeLSvRFKEK1RjzRuIXiA3HfYU7g= <mask> github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47/go.mod h1:6YNgTHLutezwnBvyneBbwvB8C82y3dcoOj5EQJIdGXA= <mask> github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 </s> add github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
<mask> github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47/go.mod h1:6YNgTHLutezwnBvyneBbwvB8C82y3dcoOj5EQJIdGXA= <mask> github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= <mask> github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= <mask> github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= <mask> github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= <mask> github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= <mask> github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE= <mask> github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
<mask> github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= <mask> github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= <mask> github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE= <mask> github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= <mask> github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= <mask> github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
<mask> github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= <mask> github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= <mask> github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= <mask> github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= <mask> github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= <mask> github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
<mask> github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= <mask> github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= <mask> github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= <mask> github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= <mask> github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= <mask> github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
<mask> github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= <mask> github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= <mask> github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= <mask> github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= <mask> github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= <mask> github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
<mask> github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= <mask> github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= <mask> github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= <mask> github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= <mask> github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= <mask> github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= <mask> github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= <mask> github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
<mask> github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= <mask> github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= <mask> github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= <mask> github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= <mask> github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= <mask> github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= <mask> github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= <mask> github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= <mask> github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
<mask> github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= <mask> github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= <mask> github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= <mask> github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= <mask> github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= <mask> github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72/go.mod h1:PjfxuH4FZdUyfMdtBio2lsRr1AKEaVPwelzuHuh8Lqc= <mask> github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= <mask> github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72/go.mod h1:PjfxuH4FZdUyfMdtBio2lsRr1AKEaVPwelzuHuh8Lqc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
<mask> github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= <mask> github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= <mask> github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= <mask> github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY= <mask> github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= <mask> github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 </s> add github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8 </s> remove github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= </s> add github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
<mask> github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= <mask> github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= <mask> github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= <mask> github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI= <mask> github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= <mask> github.com/go-ping/ping v0.0.0-20201022122018-3977ed72668a h1:O9xspHB2yrvKfMQ1m6OQhqe37i5yvg0dXAYMuAjugmM= <mask> github.com/go-ping/ping v0.0.0-20201022122018-3977ed72668a/go.mod h1:35JbSyV/BYqHwwRA6Zr1uVDm1637YlNOU61wI797NPI= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/go-ping/ping v0.0.0-20201022122018-3977ed72668a h1:O9xspHB2yrvKfMQ1m6OQhqe37i5yvg0dXAYMuAjugmM= github.com/go-ping/ping v0.0.0-20201022122018-3977ed72668a/go.mod h1:35JbSyV/BYqHwwRA6Zr1uVDm1637YlNOU61wI797NPI= github.com/go-ping/ping v0.0.0-20201115131931-3300c582a663 h1:jI2GiiRh+pPbey52EVmbU6kuLiXqwy4CXZ4gwUBj8Y0= github.com/go-ping/ping v0.0.0-20201115131931-3300c582a663/go.mod h1:35JbSyV/BYqHwwRA6Zr1uVDm1637YlNOU61wI797NPI= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
<mask> github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI= <mask> github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= <mask> github.com/go-test/deep v1.0.5 h1:AKODKU3pDH1RzZzm6YZu77YWtEAq6uh1rLIAQlay2qc= <mask> github.com/go-test/deep v1.0.5/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8= <mask> github.com/gobuffalo/envy v1.7.0 h1:GlXgaiBkmrYMHco6t4j7SacKO4XUjvh5pwXh0f4uxXU= <mask> github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= <mask> github.com/gobuffalo/envy v1.9.0 h1:eZR0DuEgVLfeIb1zIKt3bT4YovIMf9O9LXQeCZLXpqE= <mask> github.com/gobuffalo/envy v1.9.0/go.mod h1:FurDp9+EDPE4aIUS3ZLyD+7/9fpx7YRt/ukY6jIHf0w= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/gobuffalo/envy v1.9.0 h1:eZR0DuEgVLfeIb1zIKt3bT4YovIMf9O9LXQeCZLXpqE= github.com/gobuffalo/envy v1.9.0/go.mod h1:FurDp9+EDPE4aIUS3ZLyD+7/9fpx7YRt/ukY6jIHf0w=
<mask> github.com/go-test/deep v1.0.5 h1:AKODKU3pDH1RzZzm6YZu77YWtEAq6uh1rLIAQlay2qc= <mask> github.com/go-test/deep v1.0.5/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8= <mask> github.com/gobuffalo/envy v1.7.0 h1:GlXgaiBkmrYMHco6t4j7SacKO4XUjvh5pwXh0f4uxXU= <mask> github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= <mask> github.com/gobuffalo/logger v1.0.0 h1:xw9Ko9EcC5iAFprrjJ6oZco9UpzS5MQ4jAwghsLHdy4= <mask> github.com/gobuffalo/logger v1.0.0/go.mod h1:2zbswyIUa45I+c+FLXuWl9zSWEiVuthsk8ze5s8JvPs= <mask> github.com/gobuffalo/logger v1.0.3 h1:YaXOTHNPCvkqqA7w05A4v0k2tCdpr+sgFlgINbQ6gqc= <mask> github.com/gobuffalo/logger v1.0.3/go.mod h1:SoeejUwldiS7ZsyCBphOGURmWdwUFXs0J7TCjEhjKxM= <mask> github.com/gobuffalo/packd v0.3.0 h1:eMwymTkA1uXsqxS0Tpoop3Lc0u3kTfiMBE6nKtQU4g4= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/gobuffalo/logger v1.0.3 h1:YaXOTHNPCvkqqA7w05A4v0k2tCdpr+sgFlgINbQ6gqc= github.com/gobuffalo/logger v1.0.3/go.mod h1:SoeejUwldiS7ZsyCBphOGURmWdwUFXs0J7TCjEhjKxM=
<mask> github.com/gobuffalo/envy v1.9.0/go.mod h1:FurDp9+EDPE4aIUS3ZLyD+7/9fpx7YRt/ukY6jIHf0w= <mask> github.com/gobuffalo/logger v1.0.0 h1:xw9Ko9EcC5iAFprrjJ6oZco9UpzS5MQ4jAwghsLHdy4= <mask> github.com/gobuffalo/logger v1.0.0/go.mod h1:2zbswyIUa45I+c+FLXuWl9zSWEiVuthsk8ze5s8JvPs= <mask> github.com/gobuffalo/packd v0.3.0 h1:eMwymTkA1uXsqxS0Tpoop3Lc0u3kTfiMBE6nKtQU4g4= <mask> github.com/gobuffalo/packd v0.3.0/go.mod h1:zC7QkmNkYVGKPw4tHpBQ+ml7W/3tIebgeo1b36chA3Q= <mask> github.com/gobuffalo/packd v1.0.0 h1:6ERZvJHfe24rfFmA9OaoKBdC7+c9sydrytMg8SdFGBM= <mask> github.com/gobuffalo/packd v1.0.0/go.mod h1:6VTc4htmJRFB7u1m/4LeMTWjFoYrUiBkU9Fdec9hrhI= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/gobuffalo/packd v1.0.0 h1:6ERZvJHfe24rfFmA9OaoKBdC7+c9sydrytMg8SdFGBM= github.com/gobuffalo/packd v1.0.0/go.mod h1:6VTc4htmJRFB7u1m/4LeMTWjFoYrUiBkU9Fdec9hrhI=
<mask> github.com/gobuffalo/logger v1.0.3 h1:YaXOTHNPCvkqqA7w05A4v0k2tCdpr+sgFlgINbQ6gqc= <mask> github.com/gobuffalo/logger v1.0.3/go.mod h1:SoeejUwldiS7ZsyCBphOGURmWdwUFXs0J7TCjEhjKxM= <mask> github.com/gobuffalo/packd v0.3.0 h1:eMwymTkA1uXsqxS0Tpoop3Lc0u3kTfiMBE6nKtQU4g4= <mask> github.com/gobuffalo/packd v0.3.0/go.mod h1:zC7QkmNkYVGKPw4tHpBQ+ml7W/3tIebgeo1b36chA3Q= <mask> github.com/gobuffalo/packr v1.30.1 h1:hu1fuVR3fXEZR7rXNW3h8rqSML8EVAf6KNm0NKO/wKg= <mask> github.com/gobuffalo/packr v1.30.1/go.mod h1:ljMyFO2EcrnzsHsN99cvbq055Y9OhRrIaviy289eRuk= <mask> github.com/gobuffalo/packr/v2 v2.5.1 h1:TFOeY2VoGamPjQLiNDT3mn//ytzk236VMO2j7iHxJR4= <mask> github.com/gobuffalo/packr/v2 v2.5.1/go.mod h1:8f9c96ITobJlPzI44jj+4tHnEKNt0xXWSVlXRN9X1Iw= <mask> github.com/gobuffalo/packr/v2 v2.8.1 h1:tkQpju6i3EtMXJ9uoF5GT6kB+LMTimDWD8Xvbz6zDVA= <mask> github.com/gobuffalo/packr/v2 v2.8.1/go.mod h1:c/PLlOuTU+p3SybaJATW3H6lX/iK7xEz5OeMf+NnJpg= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/gobuffalo/packr/v2 v2.8.1 h1:tkQpju6i3EtMXJ9uoF5GT6kB+LMTimDWD8Xvbz6zDVA= github.com/gobuffalo/packr/v2 v2.8.1/go.mod h1:c/PLlOuTU+p3SybaJATW3H6lX/iK7xEz5OeMf+NnJpg=
<mask> github.com/gobuffalo/packr v1.30.1/go.mod h1:ljMyFO2EcrnzsHsN99cvbq055Y9OhRrIaviy289eRuk= <mask> github.com/gobuffalo/packr/v2 v2.5.1 h1:TFOeY2VoGamPjQLiNDT3mn//ytzk236VMO2j7iHxJR4= <mask> github.com/gobuffalo/packr/v2 v2.5.1/go.mod h1:8f9c96ITobJlPzI44jj+4tHnEKNt0xXWSVlXRN9X1Iw= <mask> github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= <mask> github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= <mask> github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= <mask> github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= <mask> github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= <mask> github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
<mask> github.com/gobuffalo/packr/v2 v2.5.1/go.mod h1:8f9c96ITobJlPzI44jj+4tHnEKNt0xXWSVlXRN9X1Iw= <mask> github.com/gobuffalo/packr/v2 v2.8.1 h1:tkQpju6i3EtMXJ9uoF5GT6kB+LMTimDWD8Xvbz6zDVA= <mask> github.com/gobuffalo/packr/v2 v2.8.1/go.mod h1:c/PLlOuTU+p3SybaJATW3H6lX/iK7xEz5OeMf+NnJpg= <mask> github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= <mask> github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= <mask> github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= <mask> github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= <mask> github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
<mask> github.com/gobuffalo/packr/v2 v2.8.1/go.mod h1:c/PLlOuTU+p3SybaJATW3H6lX/iK7xEz5OeMf+NnJpg= <mask> github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= <mask> github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= <mask> github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= <mask> github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= <mask> github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= <mask> github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= <mask> github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= <mask> github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= <mask> github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
<mask> github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= <mask> github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= <mask> github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= <mask> github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= <mask> github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc= <mask> github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= <mask> github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= <mask> github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= <mask> github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
<mask> github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= <mask> github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= <mask> github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= <mask> github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= <mask> github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= <mask> github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= <mask> github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= <mask> github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
<mask> github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= <mask> github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= <mask> github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= <mask> github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= <mask> github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= <mask> github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= <mask> github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= <mask> github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
<mask> github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= <mask> github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= <mask> github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= <mask> github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg= <mask> github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= <mask> github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= <mask> github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
<mask> github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= <mask> github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= <mask> github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg= <mask> github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= <mask> github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= <mask> github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= <mask> github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
<mask> github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg= <mask> github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= <mask> github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= <mask> github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= <mask> github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= <mask> github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= <mask> github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= <mask> github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= <mask> github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
<mask> github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= <mask> github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= <mask> github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= <mask> github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= <mask> github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= <mask> github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= <mask> github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= <mask> github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= <mask> github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
<mask> github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= <mask> github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= <mask> github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= <mask> github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= <mask> github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= <mask> github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 h1:/jC7qQFrv8CrSJVmaolDVOxTfS9kc36uB6H40kdbQq8= <mask> github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Goc3h8EklBH5mspfHFxBnEoURQCGzQQH1ga9Myjvis= <mask> github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= <mask> github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= <mask> github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 h1:u+vle+5E78+cT/CSMD5/Y3NUpMgA83Yu2KhG+Zbco/k= github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8/go.mod h1:CfMdguCK66I5DAUJgGKyNz8aB6vO5dZzkm9Xep6WGvw= </s> add github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8 h1:R1oP0/QEyvaL7dm+mBQouQ9V1X6gqQr5taZA1yaq5zQ= github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI= </s> remove github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 </s> add github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8 h1:R1oP0/QEyvaL7dm+mBQouQ9V1X6gqQr5taZA1yaq5zQ= github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI=
<mask> github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Goc3h8EklBH5mspfHFxBnEoURQCGzQQH1ga9Myjvis= <mask> github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= <mask> github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= <mask> github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= <mask> github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 h1:u+vle+5E78+cT/CSMD5/Y3NUpMgA83Yu2KhG+Zbco/k= <mask> github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8/go.mod h1:CfMdguCK66I5DAUJgGKyNz8aB6vO5dZzkm9Xep6WGvw= <mask> github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= <mask> github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA= <mask> github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= <mask> github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= <mask> github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 </s> add github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8 </s> remove github.com/kardianos/service v1.1.0 </s> add github.com/kardianos/service v1.2.0 github.com/karrick/godirwalk v1.16.1 // indirect github.com/lucas-clemente/quic-go v0.19.1 // indirect
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
<mask> github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= <mask> github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= <mask> github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= <mask> github.com/joomcode/errorx v1.0.1 h1:CalpDWz14ZHd68fIqluJasJosAewpz2TFaJALrUxjrk= <mask> github.com/joomcode/errorx v1.0.1/go.mod h1:kgco15ekB6cs+4Xjzo7SPeXzx38PbJzBwbnu9qfVNHQ= <mask> github.com/joomcode/errorx v1.0.3 h1:3e1mi0u7/HTPNdg6d6DYyKGBhA5l9XpsfuVE29NxnWw= <mask> github.com/joomcode/errorx v1.0.3/go.mod h1:eQzdtdlNyN7etw6YCS4W4+lu442waxZYw5yvz0ULrRo= <mask> github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw= <mask> github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 h1:u+vle+5E78+cT/CSMD5/Y3NUpMgA83Yu2KhG+Zbco/k= github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8/go.mod h1:CfMdguCK66I5DAUJgGKyNz8aB6vO5dZzkm9Xep6WGvw= </s> add github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8 h1:R1oP0/QEyvaL7dm+mBQouQ9V1X6gqQr5taZA1yaq5zQ= github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI= </s> remove github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 </s> add github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw= github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ= github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod h1:hqoO/u39cqLeBLebZ8fWdE96O7FxrAsRYhnVOdgHxok= github.com/jsimonetti/rtnetlink v0.0.0-20201110080708-d2c240429e6c/go.mod h1:huN4d1phzjhlOsNIjFsw2SVRbwIHj3fJDMEU2SDPTmg=
<mask> github.com/joomcode/errorx v1.0.3 h1:3e1mi0u7/HTPNdg6d6DYyKGBhA5l9XpsfuVE29NxnWw= <mask> github.com/joomcode/errorx v1.0.3/go.mod h1:eQzdtdlNyN7etw6YCS4W4+lu442waxZYw5yvz0ULrRo= <mask> github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= <mask> github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= <mask> github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= <mask> github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 </s> add github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
<mask> github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= <mask> github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= <mask> github.com/kardianos/service v1.1.0 h1:QV2SiEeWK42P0aEmGcsAgjApw/lRxkwopvT+Gu6t1/0= <mask> github.com/kardianos/service v1.1.0/go.mod h1:RrJI2xn5vve/r32U5suTbeaSGoMU6GbNPoj36CVYcHc= <mask> github.com/kardianos/service v1.2.0 h1:bGuZ/epo3vrt8IPC7mnKQolqFeYJb7Cs8Rk4PSOBB/g= <mask> github.com/kardianos/service v1.2.0/go.mod h1:CIMRFEJVL+0DS1a3Nx06NaMn4Dz63Ng6O7dl0qH0zVM= <mask> github.com/karrick/godirwalk v1.10.12 h1:BqUm+LuJcXjGv1d2mj3gBiQyrQ57a0rYoAmhvJQ7RDU= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/kardianos/service v1.1.0 </s> add github.com/kardianos/service v1.2.0 github.com/karrick/godirwalk v1.16.1 // indirect github.com/lucas-clemente/quic-go v0.19.1 // indirect
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/kardianos/service v1.2.0 h1:bGuZ/epo3vrt8IPC7mnKQolqFeYJb7Cs8Rk4PSOBB/g= github.com/kardianos/service v1.2.0/go.mod h1:CIMRFEJVL+0DS1a3Nx06NaMn4Dz63Ng6O7dl0qH0zVM=
<mask> github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= <mask> github.com/kardianos/service v1.1.0 h1:QV2SiEeWK42P0aEmGcsAgjApw/lRxkwopvT+Gu6t1/0= <mask> github.com/kardianos/service v1.1.0/go.mod h1:RrJI2xn5vve/r32U5suTbeaSGoMU6GbNPoj36CVYcHc= <mask> github.com/karrick/godirwalk v1.10.12 h1:BqUm+LuJcXjGv1d2mj3gBiQyrQ57a0rYoAmhvJQ7RDU= <mask> github.com/karrick/godirwalk v1.10.12/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= <mask> github.com/karrick/godirwalk v1.15.8/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= <mask> github.com/karrick/godirwalk v1.16.1 h1:DynhcF+bztK8gooS0+NDJFrdNZjJ3gzVzC545UNA9iw= <mask> github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/kardianos/service v1.1.0 </s> add github.com/kardianos/service v1.2.0 github.com/karrick/godirwalk v1.16.1 // indirect github.com/lucas-clemente/quic-go v0.19.1 // indirect
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/karrick/godirwalk v1.15.8/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/karrick/godirwalk v1.16.1 h1:DynhcF+bztK8gooS0+NDJFrdNZjJ3gzVzC545UNA9iw= github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
<mask> github.com/kardianos/service v1.2.0 h1:bGuZ/epo3vrt8IPC7mnKQolqFeYJb7Cs8Rk4PSOBB/g= <mask> github.com/kardianos/service v1.2.0/go.mod h1:CIMRFEJVL+0DS1a3Nx06NaMn4Dz63Ng6O7dl0qH0zVM= <mask> github.com/karrick/godirwalk v1.10.12 h1:BqUm+LuJcXjGv1d2mj3gBiQyrQ57a0rYoAmhvJQ7RDU= <mask> github.com/karrick/godirwalk v1.10.12/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= <mask> github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= <mask> github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= <mask> github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= <mask> github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= <mask> github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= </s> add github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= </s> remove github.com/kardianos/service v1.1.0 </s> add github.com/kardianos/service v1.2.0 github.com/karrick/godirwalk v1.16.1 // indirect github.com/lucas-clemente/quic-go v0.19.1 // indirect
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
<mask> github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= <mask> github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= <mask> github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= <mask> github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= <mask> github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= <mask> github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= <mask> github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= <mask> github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= <mask> github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= <mask> github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= <mask> github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/lucas-clemente/quic-go v0.19.0 h1:IG5lB7DfHl6eZ7WTBVL8bnbDg0JGwDv906l6JffQbyg= github.com/lucas-clemente/quic-go v0.19.0/go.mod h1:ZUygOqIoai0ASXXLJ92LTnKdbqh9MHCLTX6Nr1jUrK0= github.com/lucas-clemente/quic-go v0.19.1 h1:J9TkQJGJVOR3UmGhd4zdVYwKSA0EoXbLRf15uQJ6gT4= github.com/lucas-clemente/quic-go v0.19.1/go.mod h1:ZUygOqIoai0ASXXLJ92LTnKdbqh9MHCLTX6Nr1jUrK0=
<mask> github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= <mask> github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= <mask> github.com/lucas-clemente/quic-go v0.18.1 h1:DMR7guC0NtVS8zNZR3IO7NARZvZygkSC56GGtC6cyys= <mask> github.com/lucas-clemente/quic-go v0.18.1/go.mod h1:yXttHsSNxQi8AWijC/vLP+OJczXqzHSOcJrM5ITUlCg= <mask> github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= <mask> github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= <mask> github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= <mask> github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= <mask> github.com/markbates/errx v1.1.0 h1:QDFeR+UP95dO12JgW+tgi2UVfo0V8YBHiUIOaeBPiEI= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= </s> add github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= </s> remove github.com/kardianos/service v1.1.0 </s> add github.com/kardianos/service v1.2.0 github.com/karrick/godirwalk v1.16.1 // indirect github.com/lucas-clemente/quic-go v0.19.1 // indirect
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
<mask> github.com/lucas-clemente/quic-go v0.19.1 h1:J9TkQJGJVOR3UmGhd4zdVYwKSA0EoXbLRf15uQJ6gT4= <mask> github.com/lucas-clemente/quic-go v0.19.1/go.mod h1:ZUygOqIoai0ASXXLJ92LTnKdbqh9MHCLTX6Nr1jUrK0= <mask> github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= <mask> github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= <mask> github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= <mask> github.com/markbates/errx v1.1.0 h1:QDFeR+UP95dO12JgW+tgi2UVfo0V8YBHiUIOaeBPiEI= <mask> github.com/markbates/errx v1.1.0/go.mod h1:PLa46Oex9KNbVDZhKel8v1OT7hD5JZ2eI7AHhA0wswc= <mask> github.com/markbates/oncer v1.0.0 h1:E83IaVAHygyndzPimgUYJjbshhDTALZyXxvk9FOlQRY= <mask> github.com/markbates/oncer v1.0.0/go.mod h1:Z59JA581E9GP6w96jai+TGqafHPW+cPfRxz2aSZ0mcI= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/kardianos/service v1.1.0 </s> add github.com/kardianos/service v1.2.0 github.com/karrick/godirwalk v1.16.1 // indirect github.com/lucas-clemente/quic-go v0.19.1 // indirect
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/markbates/errx v1.1.0 h1:QDFeR+UP95dO12JgW+tgi2UVfo0V8YBHiUIOaeBPiEI= github.com/markbates/errx v1.1.0/go.mod h1:PLa46Oex9KNbVDZhKel8v1OT7hD5JZ2eI7AHhA0wswc= github.com/markbates/oncer v1.0.0 h1:E83IaVAHygyndzPimgUYJjbshhDTALZyXxvk9FOlQRY= github.com/markbates/oncer v1.0.0/go.mod h1:Z59JA581E9GP6w96jai+TGqafHPW+cPfRxz2aSZ0mcI= github.com/markbates/safe v1.0.1 h1:yjZkbvRM6IzKj9tlu/zMJLS0n/V351OZWRnF3QfaUxI= github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
<mask> github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= <mask> github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= <mask> github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= <mask> github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= <mask> github.com/marten-seemann/qpack v0.2.0/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc= <mask> github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc= <mask> github.com/marten-seemann/qtls v0.10.0 h1:ECsuYUKalRL240rRD4Ri33ISb7kAQ3qGDlrrl55b2pc= <mask> github.com/marten-seemann/qtls v0.10.0/go.mod h1:UvMd1oaYDACI99/oZUYLzMCkBXQVT0aGm99sJhbT8hs= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=
<mask> github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= <mask> github.com/marten-seemann/qpack v0.2.0/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc= <mask> github.com/marten-seemann/qtls v0.10.0 h1:ECsuYUKalRL240rRD4Ri33ISb7kAQ3qGDlrrl55b2pc= <mask> github.com/marten-seemann/qtls v0.10.0/go.mod h1:UvMd1oaYDACI99/oZUYLzMCkBXQVT0aGm99sJhbT8hs= <mask> github.com/marten-seemann/qtls-go1-15 v0.1.0 h1:i/YPXVxz8q9umso/5y474CNcHmTpA+5DH+mFPjx6PZg= <mask> github.com/marten-seemann/qtls-go1-15 v0.1.0/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I= <mask> github.com/marten-seemann/qtls-go1-15 v0.1.1 h1:LIH6K34bPVttyXnUWixk0bzH6/N07VxbSabxn5A5gZQ= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
<mask> github.com/marten-seemann/qtls-go1-15 v0.1.1 h1:LIH6K34bPVttyXnUWixk0bzH6/N07VxbSabxn5A5gZQ= <mask> github.com/marten-seemann/qtls-go1-15 v0.1.1/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I= <mask> github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= <mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 h1:lez6TS6aAau+8wXUP3G9I3TGlmPFEq2CTxBaRqY6AGE= <mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y= <mask> github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 </s> add github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8 </s> remove github.com/rogpeppe/go-internal v1.5.2 // indirect </s> add github.com/rogpeppe/go-internal v1.6.2 // indirect </s> remove github.com/kardianos/service v1.1.0 </s> add github.com/kardianos/service v1.2.0 github.com/karrick/godirwalk v1.16.1 // indirect github.com/lucas-clemente/quic-go v0.19.1 // indirect
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA= github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M= github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY= github.com/mdlayher/netlink v1.1.1/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZmb2XgV7o=
<mask> github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= <mask> github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= <mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 h1:lez6TS6aAau+8wXUP3G9I3TGlmPFEq2CTxBaRqY6AGE= <mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y= <mask> github.com/mdlayher/raw v0.0.0-20190606142536-fef19f00fc18/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg= <mask> github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 h1:aFkJ6lx4FPip+S+Uw4aTegFMct9shDvP+79PsSxpm3w= <mask> github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg= <mask> github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= <mask> github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 </s> add github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8 </s> remove github.com/rogpeppe/go-internal v1.5.2 // indirect </s> add github.com/rogpeppe/go-internal v1.6.2 // indirect </s> remove github.com/kardianos/service v1.1.0 </s> add github.com/kardianos/service v1.2.0 github.com/karrick/godirwalk v1.16.1 // indirect github.com/lucas-clemente/quic-go v0.19.1 // indirect
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
<mask> github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 h1:aFkJ6lx4FPip+S+Uw4aTegFMct9shDvP+79PsSxpm3w= <mask> github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg= <mask> github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= <mask> github.com/miekg/dns v1.1.29 h1:xHBEhR+t5RzcFJjBLJlax2daXOrTYtr9z4WdKEfWFzg= <mask> github.com/miekg/dns v1.1.29/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= <mask> github.com/miekg/dns v1.1.34/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= <mask> github.com/miekg/dns v1.1.35 h1:oTfOaDH+mZkdcgdIjH6yBajRGtIwcwcaR+rt23ZSrJs= <mask> github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 </s> add github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8 </s> remove github.com/rogpeppe/go-internal v1.5.2 // indirect </s> add github.com/rogpeppe/go-internal v1.6.2 // indirect </s> remove github.com/kardianos/service v1.1.0 </s> add github.com/kardianos/service v1.2.0 github.com/karrick/godirwalk v1.16.1 // indirect github.com/lucas-clemente/quic-go v0.19.1 // indirect
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
<mask> github.com/miekg/dns v1.1.29/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= <mask> github.com/miekg/dns v1.1.34/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= <mask> github.com/miekg/dns v1.1.35 h1:oTfOaDH+mZkdcgdIjH6yBajRGtIwcwcaR+rt23ZSrJs= <mask> github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= <mask> github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= <mask> github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= <mask> github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= <mask> github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= <mask> github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 </s> add github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8 </s> remove github.com/rogpeppe/go-internal v1.5.2 // indirect </s> add github.com/rogpeppe/go-internal v1.6.2 // indirect </s> remove github.com/kardianos/service v1.1.0 </s> add github.com/kardianos/service v1.2.0 github.com/karrick/godirwalk v1.16.1 // indirect github.com/lucas-clemente/quic-go v0.19.1 // indirect
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
<mask> github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= <mask> github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= <mask> github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= <mask> github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= <mask> github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= <mask> github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= <mask> github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= <mask> github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= <mask> github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
<mask> github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= <mask> github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= <mask> github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= <mask> github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= <mask> github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= <mask> github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
<mask> github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= <mask> github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= <mask> github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= <mask> github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= <mask> github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= <mask> github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA= <mask> github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c h1:gqEdF4VwBu3lTKGHS9rXE9x1/pEaSwCXRLOZRF6qtlw= github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c/go.mod h1:eMyUVp6f/5jnzM+3zahzl7q6UXLbgSc3MKg/+ow9QW0= </s> add github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
<mask> github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= <mask> github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= <mask> github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= <mask> github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= <mask> github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= <mask> github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
<mask> github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= <mask> github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= <mask> github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= <mask> github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= <mask> github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= <mask> github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= <mask> github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= <mask> github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
<mask> github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= <mask> github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= <mask> github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= <mask> github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= <mask> github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= <mask> github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= <mask> github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
<mask> github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= <mask> github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= <mask> github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= <mask> github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= <mask> github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= <mask> github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= <mask> github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= <mask> github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= <mask> github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
<mask> github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= <mask> github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= <mask> github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= <mask> github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= <mask> github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= <mask> github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= <mask> github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= <mask> github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= <mask> github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
<mask> github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= <mask> github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= <mask> github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= <mask> github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= <mask> github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= <mask> github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= <mask> github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= <mask> github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
<mask> github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= <mask> github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= <mask> github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= <mask> github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= <mask> github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= <mask> github.com/rogpeppe/go-internal v1.3.0 h1:RR9dF3JtopPvtkroDZuVD7qquD0bnHlKSqaQhgwt8yk= <mask> github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= <mask> github.com/rogpeppe/go-internal v1.3.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= <mask> github.com/rogpeppe/go-internal v1.5.2 h1:qLvObTrvO/XRCqmkKxUlOBc48bI3efyDuAZe25QiF0w= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/rogpeppe/go-internal v1.3.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
<mask> github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= <mask> github.com/rogpeppe/go-internal v1.3.0 h1:RR9dF3JtopPvtkroDZuVD7qquD0bnHlKSqaQhgwt8yk= <mask> github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= <mask> github.com/rogpeppe/go-internal v1.5.2 h1:qLvObTrvO/XRCqmkKxUlOBc48bI3efyDuAZe25QiF0w= <mask> github.com/rogpeppe/go-internal v1.5.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= <mask> github.com/rogpeppe/go-internal v1.6.2 h1:aIihoIOHCiLZHxyoNQ+ABL4NKhFTgKLBdMLyEAh98m0= <mask> github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= <mask> github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/rogpeppe/go-internal v1.5.2 // indirect </s> add github.com/rogpeppe/go-internal v1.6.2 // indirect
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/rogpeppe/go-internal v1.6.2 h1:aIihoIOHCiLZHxyoNQ+ABL4NKhFTgKLBdMLyEAh98m0= github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
<mask> github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= <mask> github.com/rogpeppe/go-internal v1.3.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= <mask> github.com/rogpeppe/go-internal v1.5.2 h1:qLvObTrvO/XRCqmkKxUlOBc48bI3efyDuAZe25QiF0w= <mask> github.com/rogpeppe/go-internal v1.5.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= <mask> github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= <mask> github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= <mask> github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= <mask> github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= <mask> github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= <mask> github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/rogpeppe/go-internal v1.5.2 // indirect </s> add github.com/rogpeppe/go-internal v1.6.2 // indirect
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
<mask> github.com/rogpeppe/go-internal v1.6.2 h1:aIihoIOHCiLZHxyoNQ+ABL4NKhFTgKLBdMLyEAh98m0= <mask> github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= <mask> github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= <mask> github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= <mask> github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= <mask> github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= <mask> github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= <mask> github.com/shirou/gopsutil v2.20.3+incompatible h1:0JVooMPsT7A7HqEYdydp/OfjSOYSjhXV7w1hkKj/NPQ= <mask> github.com/shirou/gopsutil v2.20.3+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/rogpeppe/go-internal v1.5.2 // indirect </s> add github.com/rogpeppe/go-internal v1.6.2 // indirect </s> remove github.com/kardianos/service v1.1.0 </s> add github.com/kardianos/service v1.2.0 github.com/karrick/godirwalk v1.16.1 // indirect github.com/lucas-clemente/quic-go v0.19.1 // indirect
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
<mask> github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= <mask> github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= <mask> github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= <mask> github.com/shirou/gopsutil v2.20.3+incompatible h1:0JVooMPsT7A7HqEYdydp/OfjSOYSjhXV7w1hkKj/NPQ= <mask> github.com/shirou/gopsutil v2.20.3+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= <mask> github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/kardianos/service v1.1.0 </s> add github.com/kardianos/service v1.2.0 github.com/karrick/godirwalk v1.16.1 // indirect github.com/lucas-clemente/quic-go v0.19.1 // indirect </s> remove github.com/rogpeppe/go-internal v1.5.2 // indirect </s> add github.com/rogpeppe/go-internal v1.6.2 // indirect </s> remove github.com/sirupsen/logrus v1.6.0 // indirect github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c </s> add github.com/sirupsen/logrus v1.7.0 // indirect github.com/spf13/cobra v1.1.1 // indirect
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
<mask> github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod h1:eWdoE5JD4R5UVWDucdOPg1g2fqQRq78IQa9zlOV1vpQ= <mask> github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod h1:TCR1lToEk4d2s07G3XGfz2QrgHXg4RJBvjrOozvoWfk= <mask> github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= <mask> github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4= <mask> github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw= <mask> github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= <mask> github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= <mask> github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= <mask> github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM= </s> Pull request: all: update backend tools and dependencies Merge in DNS/adguard-home from 2275-update-tools to master Squashed commit of the following: commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce Merge: 06b302c62 62a8fe0b7 Author: Ainar Garipov <[email protected]> Date: Thu Nov 19 16:22:30 2020 +0300 Merge branch 'master' into 2275-update-tools commit 06b302c62958aa8ab4a9da423a32cd71037d58d7 Author: Ainar Garipov <[email protected]> Date: Fri Nov 13 11:29:19 2020 +0300 all: update backend tools and dependencies </s> remove github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= </s> add github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= </s> remove github.com/sirupsen/logrus v1.6.0 // indirect github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c </s> add github.com/sirupsen/logrus v1.7.0 // indirect github.com/spf13/cobra v1.1.1 // indirect </s> remove github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c h1:gqEdF4VwBu3lTKGHS9rXE9x1/pEaSwCXRLOZRF6qtlw= github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c/go.mod h1:eMyUVp6f/5jnzM+3zahzl7q6UXLbgSc3MKg/+ow9QW0= </s> add github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= </s> remove github.com/rogpeppe/go-internal v1.5.2 // indirect </s> add github.com/rogpeppe/go-internal v1.6.2 // indirect
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca
go.sum