Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge current master of weaveworks/weave to weaveworks/scope #19

Merged
merged 16 commits into from
May 11, 2015

Conversation

peterbourgon
Copy link
Contributor

I think I did this right :)

errordeveloper and others added 16 commits May 6, 2015 16:42
This uses a special branch `latest_release_doc_updates`, as don't
require docs to be updated in retrospect for releases other then
the latest.
we don't need to extract the -nickname option since when the same
option is specified more than once, the last value wins
When we want a string representation of a Peer, we nearly always just
want the full name. So make String() return that and introduce Info()
to return expanded info.
@tomwilkie
Copy link
Contributor

LGTM

peterbourgon added a commit that referenced this pull request May 11, 2015
Merge current master of weaveworks/weave to weaveworks/scope
@peterbourgon peterbourgon merged commit 445203a into master May 11, 2015
@peterbourgon peterbourgon deleted the scope-master branch May 11, 2015 12:01
tomwilkie added a commit that referenced this pull request Mar 23, 2016
f8950ed Merge pull request #19 from weaveworks/18-misspell
b377e46 Add misspell to the lint script.
f26a5b2 Merge pull request #20 from weaveworks/socks-update
f904203 Update socks proxy for upstream changes.
495e875 Add reciept to spellchecker

git-subtree-dir: tools
git-subtree-split: f8950ed
tomwilkie added a commit that referenced this pull request Mar 23, 2016
f9aa081 Correctly fail when spelling mistakes are found.
f8950ed Merge pull request #19 from weaveworks/18-misspell
b377e46 Add misspell to the lint script.
f26a5b2 Merge pull request #20 from weaveworks/socks-update
f904203 Update socks proxy for upstream changes.
495e875 Add reciept to spellchecker

git-subtree-dir: tools
git-subtree-split: f9aa081
2opremio pushed a commit that referenced this pull request Aug 26, 2016
Add misspell to the lint script.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants