reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,951 Commits 7 Branches 85 Tags
ec0c5f0375c2c9e8404a951ce068b8374ecbfe97
Commit Graph
3951 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bryan Boreham ec0c5f0375 Merge pull request #1800 from weaveworks/1568-release-process 
Add more steps to the release process; fixes #1568 and #1506
 2015-12-23 10:52:02 +00:00
Bryan Boreham ac53d7d47b Merge pull request #1801 from weaveworks/1723_publish_plugin 
Add the plugin to the list of images to tag and push. Fixes #1723
 2015-12-23 10:46:15 +00:00
Bryan Boreham fdc7e15192 Merge branch '1.4' 2015-12-22 17:36:06 +00:00
Bryan Boreham ba266ef8d3 Add release v1.4.1 v1.4.1 2015-12-22 17:25:47 +00:00
Bryan Boreham f434fad3be Merge pull request #1822 from weaveworks/1820-unix-only 
Only pass $DOCKER_HOST if it is a Unix socket - fixes #1820
 2015-12-22 17:16:40 +00:00
Bryan Boreham bab758ebf9 Revert "Launch the proxy via unix socket in last test" 
- since we won't now be copying $DOCKER_HOST

This reverts commit d8cfbc4e08.
 2015-12-22 17:01:04 +00:00
Bryan Boreham 800f4663b6 Only pass through $DOCKER_HOST in exec_remote() if it is a Unix socket; 
a TCP socket may be secured by TLS, in which case we can't use it.
 2015-12-22 17:01:04 +00:00
Matthias Radestock 78ba69ef9f Merge branch '1.4' 2015-12-22 15:25:48 +00:00
Matthias Radestock b1b62afa90 Merge pull request #1812 from weaveworks/1810-warn-with-dns 
Issue a warning on --with-dns option to proxy, because it was removed

Fixes #1810
 2015-12-22 15:12:27 +00:00
Bryan Boreham 6b90ef7078 Clarify message 2015-12-22 14:56:40 +00:00
Matthias Radestock 593e3d3593 Merge remote-tracking branch 'upstream/1.4' 2015-12-22 14:02:15 +00:00
Matthias Radestock 2ed4b45c24 Merge pull request #1817 from weaveworks/1815-docker-version 
Check we have Docker 1.9 or newer before trying to remove a network

Fixes #1815.
 2015-12-22 14:01:55 +00:00
Matthias Radestock 716f50c4e4 Merge remote-tracking branch 'upstream/1.4' 2015-12-22 13:50:10 +00:00
Matthias Radestock 47ba9748b4 Merge pull request #1814 from weaveworks/1778-check-running 
Handle weave containers in 'restarting' state

Fixes #1778.
 2015-12-22 13:49:19 +00:00
Bryan Boreham 077ad4208f Merge pull request #1813 from weaveworks/1797-plugin-version 
Show plugin version; Fixes #1797
 2015-12-22 13:12:38 +00:00
Bryan Boreham c19edec364 Add 'weave stop-xxx' instructions for 'already running' case 2015-12-22 13:04:06 +00:00
Bryan Boreham 0c2aa494ae Reduce duplication 2015-12-22 13:03:04 +00:00
Bryan Boreham 73e0a6bb0a Inform user about weave containers in state 'restarting' 2015-12-22 13:01:00 +00:00
Bryan Boreham abf1db0045 Merge pull request #1819 from weaveworks/1818-dont-launch-when-plugin-running 
don't launch anything when plugin is running; fixes #1818 . LGTM.
 2015-12-22 12:55:57 +00:00
Matthias Radestock 2f94d727ea Merge remote-tracking branch 'upstream/1.4' 2015-12-22 12:49:00 +00:00
Matthias Radestock b40b78ece0 refactor docker_sock_volume_mount() 2015-12-22 12:47:36 +00:00
Matthias Radestock 3ade796e8d don't launch anything when plugin is running 
...just as we don't launch anything if either the router or proxy are
running.

Fixes #1818.
 2015-12-22 12:30:53 +00:00
Bryan Boreham 7c2e808924 Check we have Docker 1.9 or newer before trying to remove a network 2015-12-22 12:10:48 +00:00
Bryan Boreham 7d2227c5a4 Add plugin version to 'weave version' 2015-12-22 10:50:02 +00:00
Bryan Boreham 8a517d5c7c Issue a warning on --with-dns option to proxy, because it was removed 2015-12-22 10:00:06 +00:00
Matthias Radestock cb6176fd8a tweak ProtocolSender API 
make SendProtocolMsg return an error; this isn't used at any call
sites (yet) but is TRTTD.
 2015-12-21 18:24:22 +00:00
Matthias Radestock b93ce1cea5 refactor: no need for GossipSender.sent 2015-12-21 18:09:50 +00:00
Matthias Radestock 3be28523c9 cosmetic 2015-12-21 17:56:38 +00:00
Matthias Radestock 592335092c refactor: tweak GossipChannel API 2015-12-21 17:42:20 +00:00
Matthias Radestock 6c4e9fccd3 cosmetic 2015-12-21 17:28:22 +00:00
Matthias Radestock 6903b8d458 refactoring for consistency 2015-12-21 17:18:12 +00:00
Matthias Radestock 274265f001 typo 2015-12-21 17:03:03 +00:00
Bryan Boreham ceac3c3d83 Merge branch '1.4' 2015-12-18 09:54:22 +00:00
Bryan Boreham 48658f011f Merge pull request #1805 from weaveworks/script-indentation 
Fix indentation of weave script
 2015-12-18 09:53:12 +00:00
Bryan Boreham 4ebb13fa94 Fix indentation of netcheck if-statement 2015-12-17 16:23:42 +00:00
Bryan Boreham 5580b7a522 Add more steps to the process 2015-12-17 13:55:26 +00:00
Adam Harrison bda8cff7c1 Merge branch '1.4' 2015-12-17 13:09:20 +00:00
Adam Harrison ff9a6b91a4 Merge branch 'latest_release_doc_updates' into 1.4 2015-12-17 13:07:48 +00:00
Adam Harrison 86fc37a968 Merge pull request #1799 from weaveworks/plugin-docs 
Extend plugin docs
 2015-12-17 12:24:12 +00:00
Bryan Boreham 37ae169323 Merge remote-tracking branch 'origin/master' into latest_release_doc_updates 2015-12-17 11:48:23 +00:00
Bryan Boreham 1ce0df4e94 Explain multiple networks 2015-12-17 11:42:41 +00:00
Bryan Boreham db5ba61915 Improve formatting 2015-12-17 11:41:44 +00:00
Bryan Boreham 31006002f3 Add the plugin to the list of images to tag and push 2015-12-17 11:08:00 +00:00
Bryan Boreham db120fb9be Add release v1.4.0 v1.4.0 2015-12-17 10:30:06 +00:00
Adam Harrison ea6e171a7f Merge pull request #1794 from weaveworks/warn-stop-plugin 
Warn user if weave network is in use on stop or reset of plugin
 2015-12-17 10:27:58 +00:00
Bryan Boreham 246cb76e50 Add note to docs about not removing the plugin 2015-12-17 10:26:08 +00:00
Bryan Boreham ecf4a82b99 Warn user if weave network is in use on stop or reset 2015-12-17 10:05:36 +00:00
Bryan Boreham 357f67255e Move logging of Docker API info to callers 2015-12-17 08:25:51 +00:00
Adam Harrison 7015ab8717 Merge pull request #1780 from weaveworks/1748-no-with-dns 
Remove WITH_DNS variable from weave script
 2015-12-16 15:59:24 +00:00
Bryan Boreham 67195bc9f3 Remove WITH_DNS variable and deprecate --with-dns option to 'weave run' 2015-12-16 14:55:35 +00:00