haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

providers/docker: check proper state for docker-logs [GH-3990]

This commit is contained in:
Mitchell Hashimoto 2014-10-22 11:20:00 -07:00
parent 9c23e4d9cb
commit 1ee46d3c95
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -8,6 +8,7 @@ IMPROVEMENTS:
BUG FIXES: BUG FIXES:
- core: Fix cases where sometimes SSH connection would hang. - core: Fix cases where sometimes SSH connection would hang.
- command/docker-logs: Won't crash if container is removed. [GH-3990]
- providers/docker: Create args works. [GH-4526] - providers/docker: Create args works. [GH-4526]
- providers/docker: Nicer error if package is called. [GH-4595] - providers/docker: Nicer error if package is called. [GH-4595]
- providers/docker: Host IP restriction is forwarded through. [GH-4505] - providers/docker: Host IP restriction is forwarded through. [GH-4505]

2
plugins/providers/docker/command/logs.rb
View File

@ -43,7 +43,7 @@ module VagrantPlugins
next next
end end
state = machine.state state = machine.state.id
if state == :host_state_unknown if state == :host_state_unknown
machine.ui.output(I18n.t("docker_provider.logs_host_state_unknown")) machine.ui.output(I18n.t("docker_provider.logs_host_state_unknown"))
next next