Remove unused and racy "used" param from streamformatter #6150

Merged
merged 1 commit into from Jun 2, 2014

Conversation

Projects
None yet
5 participants
@LK4D4
Contributor

LK4D4 commented Jun 2, 2014

Also tests written

@LK4D4

This comment has been minimized.

Show comment
Hide comment
@LK4D4

LK4D4 Jun 2, 2014

Contributor
Contributor

LK4D4 commented Jun 2, 2014

@cyphar

View changes

utils/streamformatter_test.go
+ t.Fatal(err)
+ }
+ if msg.ID != "id" {
+ t.Fatalf("Status must be 'action', got: %s", msg.Status)

This comment has been minimized.

@cyphar

cyphar Jun 2, 2014

Contributor

This doesn't seem to match the condition... was this a copy-paste error?

@cyphar

cyphar Jun 2, 2014

Contributor

This doesn't seem to match the condition... was this a copy-paste error?

This comment has been minimized.

@LK4D4

LK4D4 Jun 2, 2014

Contributor

Yeah, as usual :) Thank you

@LK4D4

LK4D4 Jun 2, 2014

Contributor

Yeah, as usual :) Thank you

@crosbymichael

View changes

pkg/libcontainer/cgroups/systemd/apply_systemd.go
@@ -120,7 +120,7 @@ func Apply(c *cgroups.Cgroup, pid int) (cgroups.ActiveCgroup, error) {
// plus the kernel has some problems with joining the memory cgroup at a later time.
properties = append(properties,
systemd1.Property{"MemoryAccounting", dbus.MakeVariant(true)},
- systemd1.Property{"CPUAccounting", dbus.MakeVariant(true)},
+ //systemd1.Property{"CPUAccounting", dbus.MakeVariant(true)},

This comment has been minimized.

@crosbymichael

crosbymichael Jun 2, 2014

Contributor

Why is this here?

@crosbymichael

crosbymichael Jun 2, 2014

Contributor

Why is this here?

This comment has been minimized.

@LK4D4

LK4D4 Jun 2, 2014

Contributor

Hell, sorry, my "home" patch. Fixed

@LK4D4

LK4D4 Jun 2, 2014

Contributor

Hell, sorry, my "home" patch. Fixed

Remove unused and racy "used" param from streamformatter
Also tests written
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
@unclejack

This comment has been minimized.

Show comment
Hide comment
@unclejack

unclejack Jun 2, 2014

Contributor

LGTM

Contributor

unclejack commented Jun 2, 2014

LGTM

@vieux

This comment has been minimized.

Show comment
Hide comment
@vieux

vieux Jun 2, 2014

Collaborator

LGTM

Collaborator

vieux commented Jun 2, 2014

LGTM

vieux added a commit that referenced this pull request Jun 2, 2014

Merge pull request #6150 from LK4D4/remove_used_from_streamformatter
Remove unused and racy "used" param from streamformatter

@vieux vieux merged commit 43b7af1 into moby:master Jun 2, 2014

1 check passed

continuous-integration/travis-ci The Travis CI build passed
Details

@LK4D4 LK4D4 deleted the LK4D4:remove_used_from_streamformatter branch Jun 2, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment