Commit Graph

1354 Commits

Author SHA1 Message Date
Alex Dadgar 6736282a2a Merge branch 'master' of https://github.com/hashicorp/nomad 2015-10-12 13:15:46 -07:00
Alex Dadgar a4035050e8 Change Docker/Rkt to set driver to 1 not true for consistency 2015-10-12 13:15:37 -07:00
Alex Dadgar de226ba985 Merge pull request #266 from charlieok/patch-1
Update scheduling.html.md
2015-10-12 13:08:59 -07:00
Alex Dadgar 6bc2d6bcbd Merge pull request #268 from charlieok/patch-2
Update index.html.md
2015-10-12 13:00:33 -07:00
Armon Dadgar 6aec97d055 nomad: make test more robust 2015-10-12 09:42:25 -07:00
Armon Dadgar 41efc6b7a9 nomad: make tests more robust 2015-10-12 09:42:25 -07:00
Seth Vargo 71e65f33a2 Merge pull request #269 from charlieok/patch-3
evaulation -> evaluation
2015-10-11 22:44:51 -04:00
Seth Vargo a5d9d624f6 Merge pull request #270 from charlieok/patch-4
add 'is'
2015-10-11 22:44:39 -04:00
Charlie O'Keefe 39c87ed58e add 'is' 2015-10-11 20:36:50 -06:00
Charlie O'Keefe 66ae6eea93 evaulation -> evaluation 2015-10-11 20:33:02 -06:00
Charlie O'Keefe 07a7f24640 Update index.html.md 2015-10-11 14:05:55 -06:00
Charlie O'Keefe da16515545 Update scheduling.html.md 2015-10-11 12:25:30 -06:00
Seth Vargo 122e33547f Merge pull request #265 from charlieok/patch-1
schedule -> scheduler
2015-10-11 14:14:03 -04:00
Charlie O'Keefe b79747497c schedule -> scheduler 2015-10-11 12:07:08 -06:00
Armon Dadgar eec9695b9a Merge pull request #258 from charlieok/patch-3
this groups -> this group
2015-10-11 13:41:49 -04:00
Armon Dadgar 5b9118fa7c Merge pull request #259 from charlieok/patch-4
lets -> let's
2015-10-11 13:41:37 -04:00
Armon Dadgar a241ae16ed Merge pull request #260 from charlieok/patch-5
minor grammar fixes
2015-10-11 13:41:26 -04:00
Armon Dadgar 6efd5b4a91 Merge pull request #261 from charlieok/patch-6
rewording suggestion
2015-10-11 13:41:11 -04:00
Armon Dadgar 081b785042 Merge pull request #262 from charlieok/patch-7
replace comman with 'and'
2015-10-11 13:40:43 -04:00
Armon Dadgar 0a258bf69c Merge pull request #263 from charlieok/patch-8
Add floor characters to math expression
2015-10-11 13:40:34 -04:00
Armon Dadgar 21788836db Merge pull request #257 from charlieok/patch-2
minor grammar fixes
2015-10-11 13:40:19 -04:00
Armon Dadgar f347ce17fb Merge pull request #256 from charlieok/patch-1
an skeleton -> a skeleton
2015-10-11 13:40:05 -04:00
Charlie O'Keefe 45e507488c Add floor characters to math expression 2015-10-10 20:21:05 -06:00
Charlie O'Keefe 5156c282c5 replace comman with 'and' 2015-10-10 17:58:30 -06:00
Charlie O'Keefe 7cd3e02c77 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 fe8f934a43 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 af50e2a85c lets -> let's 2015-10-10 14:06:00 -06:00
Charlie O'Keefe 61c9929a9a this groups -> this group 2015-10-10 13:57:30 -06:00
Charlie O'Keefe 4f0c4066a4 minor grammar fixes
overtime -> over time
add comma
change -> to change
2015-10-10 13:55:09 -06:00
Charlie O'Keefe 7b43120a84 an skeleton -> a skeleton 2015-10-10 13:27:09 -06:00
Seth Vargo fa58969a12 Merge pull request #255 from charlieok/patch-1
is -> is a, it's -> its
2015-10-10 14:32:17 -04:00
Charlie O'Keefe cc101d8a74 is -> is a, it's -> its 2015-10-10 12:29:56 -06:00
Seth Vargo e54cebcc69 Merge pull request #235 from hashicorp/sethvargo/shopt
Add shopt globs to include hidden files
2015-10-10 13:47:25 -04:00
Seth Vargo 40e5970b2e Merge pull request #251 from charlieok/patch-1
change comma to semicolon
2015-10-10 13:47:15 -04:00
Seth Vargo bcec4b899a Merge pull request #252 from charlieok/patch-2
instead -> instead of
2015-10-10 13:46:56 -04:00
Seth Vargo ff451ab621 Merge pull request #253 from charlieok/patch-3
virtual the machine -> virtual machine
2015-10-10 13:46:48 -04:00
Seth Vargo 68310169f0 Merge pull request #254 from charlieok/patch-4
Update install.html.md
2015-10-10 13:46:40 -04:00
Charlie O'Keefe 9aa790ab53 Update install.html.md 2015-10-10 11:45:34 -06:00
Charlie O'Keefe 81297ba2a7 virtual the machine -> virtual machine 2015-10-10 11:31:22 -06:00
Charlie O'Keefe f5be43bf64 instead -> instead of 2015-10-10 10:47:40 -06:00
Charlie O'Keefe a30c8dc6a7 change comma to semicolon 2015-10-10 10:24:33 -06:00
Seth Vargo 822a086395 Merge pull request #249 from charlieok/patch-1
Update kubernetes.html.md
2015-10-10 11:55:39 -04:00
Charlie O'Keefe 664f9e9b4d Update kubernetes.html.md 2015-10-10 00:16:39 -06:00
Alex Dadgar c56017179f Fix raw exec test race condition 2015-10-09 20:56:28 -07:00
Alex Dadgar 3457746dec Merge pull request #248 from charlieok/patch-1
Update ecs.html.md
2015-10-09 14:27:58 -07:00
Charlie O'Keefe 0c19d75d3d Update ecs.html.md 2015-10-09 14:01:51 -06:00
Alex Dadgar 540007c1a3 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 db0ba9688d Better parsing of raw_exec option and updated docs 2015-10-09 11:29:59 -07:00
Seth Vargo 9aae5537c7 Merge pull request #244 from charlieok/patch-1
side affect -> side effect
2015-10-09 10:38:02 -04:00
Seth Vargo 336bd6fb34 Merge pull request #246 from charlieok/patch-3
add space
2015-10-09 10:37:44 -04:00