diff options
| author | Robby Russell <robby@planetargon.com> | 2014-06-30 21:00:53 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2014-06-30 21:00:53 -0700 |
| commit | 4131a59d1a57d53bf711115317116a6c57483636 (patch) | |
| tree | c3b2a746fdc18708b4c18b33c4475f20bf9d4e61 /plugins/vagrant | |
| parent | 3913106b2e7127d396f27b652df812340ec0c871 (diff) | |
| parent | 08632bb1780d51f6748b5c09ef5232862313f78f (diff) | |
| download | zsh-4131a59d1a57d53bf711115317116a6c57483636.tar.gz zsh-4131a59d1a57d53bf711115317116a6c57483636.tar.bz2 zsh-4131a59d1a57d53bf711115317116a6c57483636.zip | |
Merge pull request #2827 from ncanceill/easymerge
...you folks are amazing. :-)
"Easy-to-merge"
Diffstat (limited to 'plugins/vagrant')
| -rw-r--r-- | plugins/vagrant/_vagrant | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/vagrant/_vagrant b/plugins/vagrant/_vagrant index e05b16f81..9ddfa1be7 100644 --- a/plugins/vagrant/_vagrant +++ b/plugins/vagrant/_vagrant @@ -8,6 +8,8 @@ _1st_arguments=( 'box:Box commands' 'connect:Connects to a shared, remote Vagrant environment' 'destroy:Destroys the vagrant environment' + 'docker-logs:Shows Docker logs' + 'docker-run:Run one-off commands against a Docker container' 'global-status:Reports the status of all active Vagrant environments on the system' 'halt:Halts the currently running vagrant environment' 'init:[box_name] [box_url] Initializes current folder for Vagrant usage' |