Commit Graph

2341 Commits

Author SHA1 Message Date
Julien Bisconti
d2abdbabd1 Merge pull request #325 from devhkr/master
Deis project name changed
2017-04-21 13:57:50 +03:00
devhkr
a843f45532 Added former Deis project name 2017-04-21 12:54:09 +02:00
devhkr
ba510b51f9 Deis project name changed 2017-04-21 11:39:16 +02:00
Hyunkyo Suh
09f001f4f5 Merge pull request #324 from veggiemonk/github-links-preffered
Update CONTRIBUTING.md
2017-04-20 14:24:33 +02:00
Julien Bisconti
6cc44b7cfd Update CONTRIBUTING.md 2017-04-20 15:14:08 +03:00
Andreas Gebhardt
5ca78b304f Merge pull request #323 from veggiemonk/docker-name-changed-moby
Clarifying docker -> Moby
2017-04-20 13:29:15 +02:00
Julien Bisconti
809e07696d Clarifying docker -> Moby
Moby      = open source development

Docker CE = free product release based on Moby

Docker EE = commercial product release based on Docker CE.

Docker EE is on the same code base as Docker CE, so also built from Moby, with commercial components added, such as "docker data center / universal control plane"
2017-04-20 14:11:35 +03:00
Julien Bisconti
2ebe412963 Merge pull request #321 from erikh/patch-1
Add github.com/box-builder/box
2017-04-20 14:02:55 +03:00
Julien Bisconti
52b0c7a849 Merge branch 'master' into patch-1 2017-04-20 13:59:14 +03:00
Julien Bisconti
9c41d52000 Merge pull request #322 from devhkr/master
Minor index modification
2017-04-20 13:57:40 +03:00
devhkr
a7fc7981ee Minor index modification 2017-04-19 23:32:27 +02:00
devhkr
ad2a17a2ab Minor index modification 2017-04-19 23:15:04 +02:00
Erik Hollensbe
20acf447de Add github.com/box-builder/box
This is a new builder I have been working on for a whlie, wanted to get it added here. Please let me know if there are any issues. Thanks!
2017-04-18 08:34:22 -07:00
Hyunkyo Suh
13e8904ca6 Merge pull request #320 from agebhar1/feature/atomiqio
update AMP to ATOMIQ
2017-04-17 19:11:08 +02:00
Andreas Gebhardt
09e85a661f update AMP to ATOMIQ
Project »AMP« by »Team Appcelerator« moved to
»Atomiq.io« under new name »ATOMIQ«.
2017-04-17 18:49:11 +02:00
Julien Bisconti
61ad23aa33 Merge pull request #317 from hsorellana/master
Modified index
2017-04-16 18:31:46 +03:00
Hugo Soto
760378368b Chinese typo 2017-04-16 11:46:19 -03:00
Hugo Soto
0addbd101c Deleted people entry on index 2017-04-16 11:36:23 -03:00
Hugo Soto
61dd38c937 Deleted extra ampersand 2017-04-16 11:34:30 -03:00
Hugo Soto
0802a18cbd Fixes 2017-04-16 11:31:49 -03:00
Hugo Soto
ccfb5a1995 Modified index 2017-04-16 00:09:46 -03:00
Julien Bisconti
85a5c6e3dd Merge pull request #316 from devhkr/master
Added link for new maintainers
2017-04-15 20:00:35 +03:00
devhkr
2b99b6a224 Added link for new maintainers 2017-04-15 15:25:08 +02:00
Andreas Gebhardt
a12ecfb1e5 Merge pull request #315 from veggiemonk/jessfraz
change links from jfrazelle to jessfraz
2017-04-15 10:21:05 +02:00
Julien Bisconti
d5e1000e60 change links from jfrazelle to jessfraz 2017-04-15 10:46:38 +03:00
Julien Bisconti
33cc93c55a Merge pull request #314 from agebhar1/feature/fabiolb
update Fabio's GitHub link
2017-04-15 07:00:51 +03:00
Julien Bisconti
b1e7bbbc7d Merge branch 'master' into feature/fabiolb 2017-04-15 06:53:20 +03:00
Julien Bisconti
780b885885 Merge pull request #313 from devhkr/master
Updated link text and URL for IBM Bluemix
2017-04-15 06:51:58 +03:00
Andreas Gebhardt
0dbdbddb1b update Fabio's GitHub link
Fabio has moved from eBay to it's own organization
Fabio L(oad) B(alancer) on GitHub.
2017-04-14 20:33:40 +02:00
devhkr
005aa7b9cb Updated link text and URL for IBM Bluemix 2017-04-14 11:09:48 +02:00
Julien Bisconti
5f3faa90e3 Merge pull request #312 from devhkr/master
Removed Octohost project
2017-04-13 19:58:50 +03:00
devhkr
91f2df50b2 Removed Octohost project 2017-04-13 16:29:15 +02:00
Julien Bisconti
5fb8b94b82 Merge pull request #310 from vegasbrianc/master
updated Swarm Visualizer GitHub URL
2017-04-12 11:31:36 +03:00
Brian Christner
2f1c42201f
updated Swarm Visualizer GitHub URL 2017-04-11 12:12:16 +02:00
Brian Christner
8b649dccdb Merge pull request #309 from deiucanta/stacker-1
Add Stacker
2017-04-11 10:15:53 +02:00
Andrei Canta
fc02f8c2dc Add Stacker 2017-04-10 16:12:52 +03:00
Julien Bisconti
af5bde88e1 Merge pull request #308 from vik-y/patch-1
Replace DockerUI with portainer.io
2017-04-09 15:12:58 +03:00
Vikas Yadav
29d83b02f6 Added continuation note for DockerUI 2017-04-09 02:11:43 +05:30
Vikas Yadav
a87c08b35b Replace DockerUI with portainer.io
DockerUI is no longer maintained. It has now shifted to portainer.io.
2017-04-09 00:58:46 +05:30
Julien Bisconti
672b127130 Create pull_request_template.md 2017-04-07 20:53:22 +03:00
Julien Bisconti
63a2e5b5f4 Update LICENSE.md 2017-04-07 07:16:11 +03:00
Julien Bisconti
15a781255d Merge pull request #307 from veggiemonk/veggiemonk-patch-1
add text for new collaborators, maintainers
2017-04-06 21:47:07 +03:00
Julien Bisconti
656b1c9081 add text for new collaborators, maintainers 2017-04-06 21:45:33 +03:00
Julien Bisconti
6b1fa56ee9 Merge pull request #306 from gtonic/master
add Sonatype Nexus OSS as Docker Registry
2017-04-03 21:39:17 +03:00
Julien Bisconti
e20843fc05 Merge branch 'master' into master 2017-04-03 21:35:16 +03:00
Julien Bisconti
c11e65e4c5 Merge pull request #305 from agebhar1/feature/docker-it
add `docker-it` by @whisklabs
2017-04-03 21:34:19 +03:00
Andreas Gebhardt
fe1e75c705 add docker-it-scala by @whisklabs 2017-04-03 19:57:18 +02:00
ɹǝƃıǝ⅁ ɯo⊥
748edde4ae Merge branch 'master' into master 2017-04-03 19:26:27 +02:00
ɹǝƃıǝ⅁ ɯo⊥
34bb164231 Update README.md
list alphabetically
2017-04-03 19:02:19 +02:00
Brian Christner
1dbc9748a8 Merge pull request #304 from agebhar1/feature/sbt-docker
add `sbt-docker` by @marcuslonnberg
2017-04-03 14:49:13 +02:00