1
0
mirror of https://github.com/docker/docs.git synced 2026-10-31 10:34:26 +03:00

Merge branch 'master' into sean-polish

This commit is contained in:
Sean Li
2015-02-13 11:26:43 -08:00

View File

@@ -31,8 +31,8 @@ var VirtualBox = {
return util.exec(['pkill', 'VirtualBox']);
}).then(() => {
return util.exec(['pkill', 'VBox']);
}).catch(err => {
}).catch(() => {
});
},
vmstate: function (name) {
@@ -48,9 +48,6 @@ var VirtualBox = {
},
vmdestroy: function (name) {
return Promise.coroutine(function* () {
if (!this.installed()) {
return Promise.reject('VirtualBox not installed.');
}
try {
var state = yield this.vmstate(name);
if (state === 'running') {