Matthias Radestock
9a6afcd236
Merge branch '1.0'
2015-06-24 17:26:19 +01:00
Matthias Radestock
5f95de19ce
Merge branch 'latest_release_doc_updates' into 1.0
2015-06-24 17:25:51 +01:00
Fintan Ryan
8fb00ff206
Merge pull request #1002 from weaveworks/include-css
...
Include stylesheet in repo, update footer
2015-06-24 17:09:53 +01:00
Matthias Radestock
94a8338be5
fix typo in comment
2015-06-24 17:02:35 +01:00
David Kaltschmidt
00744fb9b4
use relative paths for stylesheet in docs
2015-06-24 17:54:50 +02:00
David Kaltschmidt
8250e05618
include stylesheet in repo, update footer
...
need because website's custom.css is fingerprinted
2015-06-24 17:18:54 +02:00
David Wragg
12c17d39cc
Merge weaveworks/separate_image_build_and_export (PR #994 )
...
separate the image build and export phases
2015-06-24 15:26:11 +01:00
David Wragg
159d47a934
Merge rade/992_fractional_sleep (PR #993 )
...
Sleep for 0.1s instead of 1s in the wait_for_status loop.
Closes #992 .
2015-06-24 12:44:52 +01:00
Matthias Radestock
4b11874390
sleep for 0.1s instead of 1s in the wait_for_status loop
...
This reduces `weave launch|launch-dns` execution time.
Closes #992 .
2015-06-24 12:16:52 +01:00
Matthias Radestock
3c7cff1c9c
Merge pull request #996 from weaveworks/rm_dockercon_pointer
...
Remove Link to Dockercon from README
2015-06-24 10:47:00 +01:00
Fintan Ryan
e3574f243f
Remove Link to Dockercon from README
2015-06-24 10:35:12 +01:00
Matthias Radestock
bdda9d03ae
bump docker version in weave-build docker image
...
to 1.3.1, the same version we use everywhere else, e.g. in weavexec.
2015-06-24 03:24:58 +01:00
Matthias Radestock
ae1805de76
separate the image build and export phases
...
That way the export can be just a single tar, which is more
convenient. And without introducing unnecessary image builds.
2015-06-24 02:54:45 +01:00
Matthias Radestock
0ce123e63a
Merge branch '1.0'
2015-06-24 02:53:06 +01:00
Matthias Radestock
9ae45f6674
Merge branch 'latest_release_doc_updates' into 1.0
2015-06-24 02:52:37 +01:00
Matthias Radestock
6c3aa99595
bump min required docker version for build
...
to the same version we use everywhere else, e.g. in weaveexec
2015-06-24 02:51:24 +01:00
Matthias Radestock
215d96fdc3
Merge branch '1.0'
2015-06-23 23:18:09 +01:00
Matthias Radestock
2c73fd6dde
Merge branch 'latest_release_doc_updates' into 1.0
2015-06-23 23:17:38 +01:00
Matthias Radestock
3b27413887
fix broken link
2015-06-23 23:17:05 +01:00
Matthias Radestock
eb9e450cf1
cosmetic
2015-06-23 19:10:10 +01:00
Paul Bellamy
95d72a57e8
Merge pull request #989 from rade/prefetch_test_images
...
prefetch test images
2015-06-23 15:14:59 +01:00
Adam Harrison
aa8d9eab53
Merge branch '1.0'
2015-06-23 15:05:32 +01:00
Adam Harrison
17ee829299
Merge branch 'latest_release_doc_updates' into 1.0
2015-06-23 15:05:02 +01:00
Adam Harrison
5db39466e8
Fix broken IPAM link
2015-06-23 15:04:37 +01:00
Matthias Radestock
43b8840dd2
Merge branch '1.0'
2015-06-23 14:58:55 +01:00
Matthias Radestock
cc4ab80f62
Merge branch 'latest_release_doc_updates' into 1.0
2015-06-23 14:57:51 +01:00
Matthias Radestock
0e47cee661
remove references to dns, ipam and proxy docs from ToCs
...
Since they are now explained and referenced prominently from the main
Features documentation.
2015-06-23 14:53:49 +01:00
Adam Harrison
59e667801d
Merge GCE fix from branch '1.0'
2015-06-23 14:50:58 +01:00
Adam Harrison
d6dca80dd7
Merge branch 'latest_release_doc_updates' into 1.0
...
Pull in GCE fix
2015-06-23 14:49:36 +01:00
Tom Wilkie
74c391f19c
Update gce.sh make_template command, and build a fresh template.
2015-06-23 14:48:48 +01:00
Matthias Radestock
ae8172ec97
simplify docker image removal
2015-06-23 14:39:29 +01:00
Adam Harrison
d6ab78ff03
Merge documentation from branch '1.0'
2015-06-23 14:36:04 +01:00
Adam Harrison
7e36dc01e8
Merge documentation from branch 'latest_release_doc_updates' into 1.0
2015-06-23 14:35:30 +01:00
Adam Harrison
9020c84f81
Merge pull request #990 from awh/feature_docs_proxy_section
...
Add docker integration section to feature docs
2015-06-23 14:34:25 +01:00
Adam Harrison
d0a1514ab6
Removed redundant further reading section from feature docs
2015-06-23 14:33:33 +01:00
Adam Harrison
06c3a0cf2a
Add docker integration section to feature docs
2015-06-23 14:33:29 +01:00
Adam Harrison
dde5782625
Merge documentation from branch '1.0'
2015-06-23 14:21:05 +01:00
Adam Harrison
a1913130e7
Merge documentation from branch 'latest_release_doc_updates' into 1.0
2015-06-23 14:18:42 +01:00
Matthias Radestock
369bd0f4dc
prefetch test images
...
This gives more consistent test execution times, and also make image
fetch failures more apparent and decoupled from the tests.
We could *always* just run pull, but it's an expensive operation, so
we check for the presence of the image first. The downside is that we
could be running old images. That is not a problem on our CI
infrastructure though since it spins up fresh VMs per for every tun.
2015-06-23 14:16:52 +01:00
Tom Wilkie
3b4a47a961
Update gce.sh make_template command, and build a fresh template.
2015-06-23 13:07:09 +00:00
Matthias Radestock
f29ee3ad05
Merge pull request #986 from awh/feature_docs_weavedns_section
...
Add service discovery section to features docs
2015-06-23 13:55:50 +01:00
Adam Harrison
19a3fc6b9e
Add naming and discovery section to features docs
2015-06-23 13:50:37 +01:00
Paul Bellamy
0a287217b6
Merge pull request #955 from paulbellamy/testing
...
Replacing custom testing helpers with testify, where possible
2015-06-23 12:21:24 +01:00
Adam Harrison
043d15355c
Restore commit lost to force push
2015-06-23 11:53:22 +01:00
Matthias Radestock
2c4cebe9d9
Merge branch '1.0'
2015-06-23 10:31:40 +01:00
Matthias Radestock
9ec1ce3225
Merge pull request #981 from weaveworks/970_show_docker_py_test_failures
...
show docker-py test failures
2015-06-23 10:30:57 +01:00
Matthias Radestock
cedf9bb82d
Merge branch '1.0'
2015-06-23 09:54:24 +01:00
Matthias Radestock
1b4f83c067
Merge branch 'latest_release_doc_updates' into 1.0
2015-06-23 09:53:44 +01:00
Matthias Radestock
c126c403e7
Merge pull request #983 from rade/improve_ipam_doc_integration
...
improve IPAM doc integration
2015-06-23 09:52:39 +01:00
Matthias Radestock
90b9b3c1bf
'address allocation' is the feature
...
covering both automatic and manual allocation
2015-06-23 09:50:39 +01:00
Matthias Radestock