Skip to content

Add Containers topology#106

Merged
peterbourgon merged 1 commit intomasterfrom
add-containers-topology
May 26, 2015
Merged

Add Containers topology#106
peterbourgon merged 1 commit intomasterfrom
add-containers-topology

Conversation

@peterbourgon
Copy link
Contributor

@peterbourgon peterbourgon commented May 26, 2015

  • In the default view, nodes from the same container instance (docker ID) are merged
  • In the grouped view, nodes from the same container image (docker image ID) are merged

Closes #91.

/cc @tomwilkie

@peterbourgon peterbourgon force-pushed the add-containers-topology branch from 54104ad to b493383 Compare May 26, 2015 13:51
@coveralls
Copy link

coveralls commented May 26, 2015

Coverage Status

Coverage increased (+0.37%) to 62.66% when pulling b493383 on add-containers-topology into 957d525 on master.

tomwilkie
tomwilkie reviewed May 26, 2015
View reviewed changes
report/mapping_functions.go Outdated

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

@tomwilkie
Copy link
Contributor

tomwilkie commented May 26, 2015

Can you rebase and squash this into one please? We don't need to introduce extra merge commits, or commits like "Works on my machine". Also need to resolve why my two csets are appearing on your branch; probably go away if you rebase.

@tomwilkie
Copy link
Contributor

tomwilkie commented May 26, 2015

Ah I see you already got rid of the merge.

@peterbourgon peterbourgon force-pushed the add-containers-topology branch from b493383 to 00a623a Compare May 26, 2015 14:04
@coveralls
Copy link

coveralls commented May 26, 2015

Coverage Status

Coverage increased (+0.44%) to 62.72% when pulling 00a623a on add-containers-topology into 957d525 on master.

tomwilkie
tomwilkie reviewed May 26, 2015
View reviewed changes
report/mapping_functions.go

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

@peterbourgon peterbourgon force-pushed the add-containers-topology branch from 00a623a to bf49e12 Compare May 26, 2015 14:38
@tomwilkie
Copy link
Contributor

tomwilkie commented May 26, 2015

LGTM

peterbourgon added a commit that referenced this pull request May 26, 2015
@peterbourgon
Merge pull request #106 from weaveworks/add-containers-topology
e518c71 
Add Containers topology
@peterbourgon peterbourgon merged commit e518c71 into master May 26, 2015
@peterbourgon peterbourgon deleted the add-containers-topology branch May 26, 2015 15:11
bboreham added a commit that referenced this pull request Jul 13, 2017
@bboreham
Squashed 'tools/' changes from 0d6d4da..74dc626
1eeb4d0 
74dc626 Merge pull request #108 from weaveworks/disable-apt-daily
b4f1d91 Merge pull request #107 from weaveworks/docker-17-update
7436aa1 Override apt daily job to not run immediately on boot
7980f15 Merge pull request #106 from weaveworks/document-docker-install-role
f741e53 Bump to Docker 17.06 from CE repo
61796a1 Update Docker CE Debian repo details
0d86f5e Allow for Docker package to be named docker-ce
065c68d Document selection of Docker installation role.
3809053 Just --porcelain; it defaults to v1
11400ea Merge pull request #105 from weaveworks/remove-weaveplugin-remnants
b8b4d64 remove weaveplugin remnants
35099c9 Merge pull request #104 from weaveworks/pull-docker-py
cdd48fc Pull docker-py to speed tests/builds up.
e1c6c24 Merge pull request #103 from weaveworks/test-build-tags
d5d71e0 Add -tags option so callers can pass in build tags
8949b2b Merge pull request #98 from weaveworks/git-status-tag
ac30687 Merge pull request #100 from weaveworks/python_linting
4b125b5 Pin yapf & flake8 versions
7efb485 Lint python linting function
444755b Swap diff direction to reflect changes required
c5b2434 Install flake8 & yapf
5600eac Lint python in build-tools repo
0b02ca9 Add python linting
c011c0d Merge pull request #79 from kinvolk/schu/python-shebang
6577d07 Merge pull request #99 from weaveworks/shfmt-version
00ce0dc Use git status instead of diff to add 'WIP' tag
411fd13 Use shfmt v1.3.0 instead of latest from master.
31d069d Change Python shebang to `#!/usr/bin/env python`

git-subtree-dir: tools
git-subtree-split: 74dc626b6de3ffb38591510f7cb7bc2db33743c4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Add "container" topology

3 participants

@peterbourgon @coveralls @tomwilkie