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
1a17b41bc3
reduce test output noise
2015-06-23 09:42:46 +01:00
Matthias Radestock
2e5e0a7730
remove pointless assertion
2015-06-23 09:42:46 +01:00
Matthias Radestock
b2f62cc635
show test failure output
...
step towards fixing #970
2015-06-23 09:42:46 +01:00
Matthias Radestock
2a9f8a3d75
Merge branch '1.0'
2015-06-22 23:00:29 +01:00
Matthias Radestock
0a553d6630
Merge branch 'latest_release_doc_updates' into 1.0
2015-06-22 22:59:16 +01:00
Matthias Radestock
e51c240ea1
fix broken links
2015-06-22 22:57:48 +01:00
Paul Bellamy
acd5b91eb8
Merge remote-tracking branch 'upstream/1.0'
2015-06-22 17:28:50 +01:00
Paul Bellamy
f5201469a3
Merge pull request #980 from paulbellamy/only-one-entrypoint
...
[proxy] Only prepend weavewait if not already present
2015-06-22 17:28:20 +01:00
Paul Bellamy
34aa2e32d8
[proxy] Only prepend weavewait if not already present
...
This way `docker commit` will not stack up weavewaits.
2015-06-22 15:24:49 +01:00
Adam Harrison
bda245bfdb
Merge pull request #968 from rade/954_show_attach_expose_addresses
...
show IP addresses in attach/expose/detach/hide
2015-06-22 14:49:41 +01:00
Bryan Boreham
d1eb2917e8
Merge documentation from branch 1.0 into master
2015-06-22 14:32:12 +01:00
Bryan Boreham
9a631d0ecd
Merge documentation from branch 'latest_release_doc_updates' into 1.0
2015-06-22 14:25:56 +01:00
Bryan Boreham
c8032b6b25
Merge pull request #977 from bboreham/proxy-net-syntax
...
Change one IPAM proxy example to use a network
2015-06-22 14:24:24 +01:00
Bryan Boreham
68ca6ebe04
Change one IPAM proxy example to use the 'net:' syntax
2015-06-22 14:15:24 +01:00
Matthias Radestock
9f0cd93859
refactor(ish): get the more fundamental setup out of the way first
2015-06-22 12:50:50 +01:00
Matthias Radestock
7cf0d59003
update docs
2015-06-22 12:34:32 +01:00
Adam Harrison
74f8c07674
Merge documentation from branch '1.0'
2015-06-22 12:05:40 +01:00
Adam Harrison
1bbec56cc7
Merge documenation from branch 'latest_release_doc_updates' into 1.0
2015-06-22 12:02:35 +01:00
Adam Harrison
b86bae9c86
Fix incorrect address in service import/export examples
2015-06-22 12:00:57 +01:00
Paul Bellamy
6d89867a74
Merge pull request #978 from rade/972_remove_proxy_d_option
...
remove proxy -D option
2015-06-22 11:36:37 +01:00
Paul Bellamy