docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11359 from sunyuan3/m1 

correct some daemon spelling mistakes
This commit is contained in:
Doug Davis 2015-03-12 22:17:19 -04:00
parent 50c6c675e6 906974b185
commit 4e7bf0dde4
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/monitor.go
View File

@ -182,7 +182,7 @@ func (m *containerMonitor) Start() error {
} }
// resetMonitor resets the stateful fields on the containerMonitor based on the // resetMonitor resets the stateful fields on the containerMonitor based on the
// previous runs success or failure. Reguardless of success, if the container had // previous runs success or failure. Regardless of success, if the container had
// an execution time of more than 10s then reset the timer back to the default // an execution time of more than 10s then reset the timer back to the default
func (m *containerMonitor) resetMonitor(successful bool) { func (m *containerMonitor) resetMonitor(successful bool) {
executionTime := time.Now().Sub(m.lastStartTime).Seconds() executionTime := time.Now().Sub(m.lastStartTime).Seconds()

2
integration-cli/docker_cli_daemon_test.go
View File

@ -408,7 +408,7 @@ func TestDaemonKeyMigration(t *testing.T) {
} }
// Simulate an older daemon (pre 1.3) coming up with volumes specified in containers // Simulate an older daemon (pre 1.3) coming up with volumes specified in containers
// without corrosponding volume json // without corresponding volume json
func TestDaemonUpgradeWithVolumes(t *testing.T) { func TestDaemonUpgradeWithVolumes(t *testing.T) {
d := NewDaemon(t) d := NewDaemon(t)

2
integration-cli/docker_cli_exec_test.go
View File

@ -197,7 +197,7 @@ func TestExecAfterDaemonRestart(t *testing.T) {
logDone("exec - exec running container after daemon restart") logDone("exec - exec running container after daemon restart")
} }
// Regresssion test for #9155, #9044 // Regression test for #9155, #9044
func TestExecEnv(t *testing.T) { func TestExecEnv(t *testing.T) {
defer deleteAllContainers() defer deleteAllContainers()