TrueCloudLab/distribution
13
0
Fork 3
Code Issues 3 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #11788 from reikani/pchoi

Browse source 
Changed snake case naming to camelCase.
This commit is contained in:
Brian Goff 2015-03-26 23:55:50 -07:00
commit 9e9a8add19
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/config.go
View file

@ -60,10 +60,10 @@ func (ipnet *netIPNet) MarshalJSON() ([]byte, error) {
} }
func (ipnet *netIPNet) UnmarshalJSON(b []byte) (err error) { func (ipnet *netIPNet) UnmarshalJSON(b []byte) (err error) {
var ipnet_str string var ipnetStr string
if err = json.Unmarshal(b, &ipnet_str); err == nil { if err = json.Unmarshal(b, &ipnetStr); err == nil {
var cidr *net.IPNet var cidr *net.IPNet
if _, cidr, err = net.ParseCIDR(ipnet_str); err == nil { if _, cidr, err = net.ParseCIDR(ipnetStr); err == nil {
*ipnet = netIPNet(*cidr) *ipnet = netIPNet(*cidr)
} }
} }

8
docs/registry_mock_test.go
View file

@ -171,7 +171,7 @@ func makePublicIndex() *IndexInfo {
return index return index
} }
func makeServiceConfig(mirrors []string, insecure_registries []string) *ServiceConfig { func makeServiceConfig(mirrors []string, insecureRegistries []string) *ServiceConfig {
options := &Options{ options := &Options{
Mirrors: opts.NewListOpts(nil), Mirrors: opts.NewListOpts(nil),
InsecureRegistries: opts.NewListOpts(nil), InsecureRegistries: opts.NewListOpts(nil),
@ -181,9 +181,9 @@ func makeServiceConfig(mirrors []string, insecure_registries []string) *ServiceC
options.Mirrors.Set(mirror) options.Mirrors.Set(mirror)
} }
} }
if insecure_registries != nil { if insecureRegistries != nil {
for _, insecure_registries := range insecure_registries { for _, insecureRegistries := range insecureRegistries {
options.InsecureRegistries.Set(insecure_registries) options.InsecureRegistries.Set(insecureRegistries)
} }
} }