kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

fix typos

Browse source 
Signed-off-by: allencloud <allen.sun@daocloud.io>
This commit is contained in:
allencloud 2016-03-28 18:57:55 +08:00
parent 4afeabfdad
commit 5c161ade98
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
daemon/config.go
View file

@ -33,7 +33,7 @@ var flatOptions = map[string]bool{
// LogConfig represents the default log configuration. // LogConfig represents the default log configuration.
// It includes json tags to deserialize configuration from a file // It includes json tags to deserialize configuration from a file
// using the same names that the flags in the command line uses. // using the same names that the flags in the command line use.
type LogConfig struct { type LogConfig struct {
Type string `json:"log-driver,omitempty"` Type string `json:"log-driver,omitempty"`
Config map[string]string `json:"log-opts,omitempty"` Config map[string]string `json:"log-opts,omitempty"`
@ -41,17 +41,17 @@ type LogConfig struct {
// CommonTLSOptions defines TLS configuration for the daemon server. // CommonTLSOptions defines TLS configuration for the daemon server.
// It includes json tags to deserialize configuration from a file // It includes json tags to deserialize configuration from a file
// using the same names that the flags in the command line uses. // using the same names that the flags in the command line use.
type CommonTLSOptions struct { type CommonTLSOptions struct {
CAFile string `json:"tlscacert,omitempty"` CAFile string `json:"tlscacert,omitempty"`
CertFile string `json:"tlscert,omitempty"` CertFile string `json:"tlscert,omitempty"`
KeyFile string `json:"tlskey,omitempty"` KeyFile string `json:"tlskey,omitempty"`
} }
// CommonConfig defines the configuration of a docker daemon which are // CommonConfig defines the configuration of a docker daemon which is
// common across platforms. // common across platforms.
// It includes json tags to deserialize configuration from a file // It includes json tags to deserialize configuration from a file
// using the same names that the flags in the command line uses. // using the same names that the flags in the command line use.
type CommonConfig struct { type CommonConfig struct {
AuthorizationPlugins []string `json:"authorization-plugins,omitempty"` // AuthorizationPlugins holds list of authorization plugins AuthorizationPlugins []string `json:"authorization-plugins,omitempty"` // AuthorizationPlugins holds list of authorization plugins
AutoRestart bool `json:"-"` AutoRestart bool `json:"-"`

3
daemon/daemon.go
View file

@ -1591,8 +1591,9 @@ func (daemon *Daemon) initDiscovery(config *Config) error {
// Reload reads configuration changes and modifies the // Reload reads configuration changes and modifies the
// daemon according to those changes. // daemon according to those changes.
// This are the settings that Reload changes: // These are the settings that Reload changes:
// - Daemon labels. // - Daemon labels.
// - Daemon debug log level.
// - Cluster discovery (reconfigure and restart). // - Cluster discovery (reconfigure and restart).
func (daemon *Daemon) Reload(config *Config) error { func (daemon *Daemon) Reload(config *Config) error {
daemon.configStore.reloadLock.Lock() daemon.configStore.reloadLock.Lock()

2
opts/opts.go
View file

@ -36,7 +36,7 @@ func (opts *ListOpts) String() string {
return fmt.Sprintf("%v", []string((*opts.values))) return fmt.Sprintf("%v", []string((*opts.values)))
} }
// Set validates if needed the input value and add it to the // Set validates if needed the input value and adds it to the
// internal slice. // internal slice.
func (opts *ListOpts) Set(value string) error { func (opts *ListOpts) Set(value string) error {
if opts.validator != nil { if opts.validator != nil {