Commit Graph

248 Commits

Author SHA1 Message Date
Armon Dadgar
b07190e4c8 Merge pull request #259 from charlieok/patch-4
lets -> let's
2015-10-11 13:41:37 -04:00
Armon Dadgar
ac38845389 Merge pull request #260 from charlieok/patch-5
minor grammar fixes
2015-10-11 13:41:26 -04:00
Armon Dadgar
ff9014bb53 Merge pull request #261 from charlieok/patch-6
rewording suggestion
2015-10-11 13:41:11 -04:00
Armon Dadgar
5b98007fae Merge pull request #262 from charlieok/patch-7
replace comman with 'and'
2015-10-11 13:40:43 -04:00
Armon Dadgar
f9eafcc358 Merge pull request #263 from charlieok/patch-8
Add floor characters to math expression
2015-10-11 13:40:34 -04:00
Armon Dadgar
a80bbaa079 Merge pull request #257 from charlieok/patch-2
minor grammar fixes
2015-10-11 13:40:19 -04:00
Charlie O'Keefe
9323a8c7dc Add floor characters to math expression 2015-10-10 20:21:05 -06:00
Charlie O'Keefe
b3cfd06cd3 replace comman with 'and' 2015-10-10 17:58:30 -06:00
Charlie O'Keefe
04b7443dd4 rewording suggestion
have it elect as a leader -> have it elected as a leader

Not completely sure if this is correct (maybe “have it elect itself as a leader” is better?)
2015-10-10 14:51:43 -06:00
Charlie O'Keefe
14ba8e3c0a minor grammar fixes
the updated -> the update
remove redundant 'each time', 'at a time'
2015-10-10 14:16:29 -06:00
Charlie O'Keefe
4c14019f62 lets -> let's 2015-10-10 14:06:00 -06:00
Charlie O'Keefe
175dcd858b minor grammar fixes
overtime -> over time
add comma
change -> to change
2015-10-10 13:55:09 -06:00
Charlie O'Keefe
83fd8c3cdc an skeleton -> a skeleton 2015-10-10 13:27:09 -06:00
Charlie O'Keefe
07d8e2a5fe is -> is a, it's -> its 2015-10-10 12:29:56 -06:00
Seth Vargo
5d8cc8fb8f Merge pull request #251 from charlieok/patch-1
change comma to semicolon
2015-10-10 13:47:15 -04:00
Seth Vargo
c56b957ad5 Merge pull request #252 from charlieok/patch-2
instead -> instead of
2015-10-10 13:46:56 -04:00
Seth Vargo
8ff2e78b96 Merge pull request #253 from charlieok/patch-3
virtual the machine -> virtual machine
2015-10-10 13:46:48 -04:00
Charlie O'Keefe
a8b74a57a8 Update install.html.md 2015-10-10 11:45:34 -06:00
Charlie O'Keefe
0a202f5e6e virtual the machine -> virtual machine 2015-10-10 11:31:22 -06:00
Charlie O'Keefe
203466252b instead -> instead of 2015-10-10 10:47:40 -06:00
Charlie O'Keefe
35ed293a31 change comma to semicolon 2015-10-10 10:24:33 -06:00
Charlie O'Keefe
889090be15 Update kubernetes.html.md 2015-10-10 00:16:39 -06:00
Charlie O'Keefe
0c266684d6 Update ecs.html.md 2015-10-09 14:01:51 -06:00
Alex Dadgar
0d02839220 Merge pull request #237 from hashicorp/f-raw-exec-driver
A raw fork/exec driver that provides no isolation.
2015-10-09 11:30:12 -07:00
Alex Dadgar
bbdceca358 Better parsing of raw_exec option and updated docs 2015-10-09 11:29:59 -07:00
Seth Vargo
b998b86183 Merge pull request #244 from charlieok/patch-1
side affect -> side effect
2015-10-09 10:38:02 -04:00
Charlie O'Keefe
ff8d14cb62 add space 2015-10-09 08:34:28 -06:00
Charlie O'Keefe
3d5f236384 side affect -> side effect 2015-10-09 08:29:33 -06:00
Chris Bednarski
6c90314a51 Merge pull request #225 from hashicorp/b-docker-port
Change docker default port to support windows and boot2docker
2015-10-08 23:50:11 -07:00
Alex Dadgar
c4e4861889 Documentation 2015-10-08 12:19:39 -07:00
Alex Dadgar
60346ae8ec Actually add the files 2015-10-08 12:19:39 -07:00
Charlie O'Keefe
a9a7ebec4e Remove redundant 'contains' 2015-10-08 08:39:27 -06:00
Chris Bednarski
dc1d845e2c Added documentation for DOCKER_HOST and docker.endpoint; also filled in docs for docker.cleanup 2015-10-08 00:08:54 -07:00
Abhishek Chanda
43a8a1af96 Add an optional exec parameter to task config
This overrides the default exec command in the ACI
2015-10-07 15:15:36 -07:00
Abhishek Chanda
61b4be2389 Remove a stray comment 2015-10-06 15:56:39 -07:00
Alex Dadgar
50862f8e31 Switch to using BlkioWeight 2015-10-06 15:44:01 -07:00
Kevin Fishner
022b6fb6c5 Update _footer.erb 2015-10-05 22:23:09 -04:00
Daniel Imfeld
be652ac645 Typo: singel -> single 2015-10-03 21:33:41 -05:00
Kevin Fishner
5390f522d0 Merge pull request #210 from hashicorp/vs-k8s
Update to versus section
2015-10-03 18:51:46 -04:00
Kevin Fishner
39aa11ab87 update description 2015-10-03 18:50:23 -04:00
Antoine POPINEAU
b42d987e19 Updated website documentation. 2015-10-02 17:46:55 -07:00
Alex Dadgar
d8f3bd26e6 Merges 2015-10-02 17:32:11 -07:00
Ryan Uber
62b3b01919 Merge branch 'parse-client-options' of https://github.com/carlosdp/nomad into b-options 2015-10-02 16:58:05 -07:00
Abhishek Chanda
040518e06b Fix network mode
net is not a valid network mode
2015-10-02 16:11:38 -07:00
Antoine POPINEAU
e3bcf4490b Merge branch 'master' into dev/net-fingerprint 2015-10-02 09:38:35 +02:00
Antoine POPINEAU
256d390789 Renamed all instances of Iface to NetworkInterface. 2015-10-02 09:29:18 +02:00
Alex Dadgar
96b6109bab Merge pull request #184 from achanda/docker_net
Enable setting networking mode for docker
2015-10-01 19:32:48 -07:00
Alex Dadgar
3c11134ccf Fix anchor links and add new agent cli commands 2015-10-01 19:28:21 -07:00
Abhishek Chanda
ee2cd3bed0 Enable setting networking mode for docker
This patch enables setting networking mode for the docker
driver. This does not handle the `container` mode.
Closes #175
2015-10-01 18:52:41 -07:00
Jack Pearkes
9172780b09 website: update docker logo to adhere to brand guidelines
![](https://dl.dropboxusercontent.com/s/p60yujlru03d53v/2015-10-01%20at%201.44%20PM.png)

https://www.docker.com/brand-guidelines
2015-10-01 13:44:58 -07:00