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
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
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
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
a1913130e7
Merge documentation from branch 'latest_release_doc_updates' into 1.0
2015-06-23 14:18:42 +01: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
Adam Harrison
043d15355c
Restore commit lost to force push
2015-06-23 11:53:22 +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
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
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
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
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
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
Matthias Radestock
6f798f723a
Merge remote-tracking branch 'upstream/1.0' into 1.0
2015-06-22 11:17:40 +01:00
Adam Harrison
b1bd1d4d6a
Merge pull request #964 from awh/v1.0_use_proxy_doc_updates
...
Update documentation to leverage proxy
2015-06-22 10:46:00 +01:00
Adam Harrison
1e638be7ac
Remove weave run from how it works
2015-06-22 10:36:56 +01:00
Adam Harrison
acd2b9abeb
Reword proxy hyperlink text in index
2015-06-22 10:36:56 +01:00
Adam Harrison
6ddecfc764
Update proxy docs
2015-06-22 10:36:56 +01:00
Adam Harrison
f15ad71354
Update IPAM docs to use proxy
2015-06-22 10:36:56 +01:00
Adam Harrison
4d54af39b0
Update weaveDNS docs to use proxy
2015-06-22 10:36:56 +01:00
Adam Harrison
81d5a8f4f5
Update features docs to use proxy
2015-06-22 10:36:56 +01:00
Adam Harrison
344119f42a
Update README examples to use proxy
2015-06-22 10:36:52 +01:00
Matthias Radestock
514db8efdd
Merge branch 'latest_release_doc_updates' into 1.0
2015-06-22 10:31:20 +01:00
Paul Bellamy
0693ec55c6
Merge pull request #974 from rade/972_remove_proxy_d_option_from_docs
...
remove the `-D` proxy option from the docs
2015-06-22 10:29:16 +01:00
Matthias Radestock
56c720b078
remove the -D proxy option from the docs
...
It doesn't do anything useful since the weave script needs to be able
to talk to docker on the standard unix socket.
Also remove dangling reference to 'localhost', and move note about
firwalls to where it is most pertinent.
Part fix to #972 .
2015-06-22 10:20:18 +01:00
Matthias Radestock
403b9654f1
Merge remote-tracking branch 'upstream/1.0' into latest_release_doc_updates
2015-06-21 10:41:38 +01:00
Matthias Radestock
84775e414b
Add release 1.0.1
2015-06-21 10:05:52 +01:00
Matthias Radestock
d913ca869c
Merge branch '967_include_image_name_in_inspect_error' into 1.0
2015-06-21 09:38:42 +01:00
Matthias Radestock
3732f968d0
include image name in errors
...
The go docker client's ErrNoSuchImage does not include the image
name. However, it is imperative that this name appears in error
messages sent to clients, since the docker client, as of version
1.7.0, only automatically pulls images when their name is present in
the error.
Fixes #967 .
2015-06-20 23:36:48 +01:00
Bryan Boreham
b7281cc08d
Add release 1.0.0
2015-06-18 11:23:44 +01:00
Adam Harrison
617c3883c7
Merge pull request #948 from awh/v1.0_doc_updates
...
Update documentation to leverage IPAM and DNS
2015-06-18 10:38:32 +01:00
Adam Harrison
9e20a5256b
Rename example containers
2015-06-18 10:32:15 +01:00
Matthias Radestock
a3db33cfd9
more helpful error message when weave et al die on startup
...
Closes #958 .
2015-06-17 22:54:11 +01:00
Adam Harrison