Skip to content

Add RootDir property to GraphData#585

Merged
marcuslinke merged 4 commits intodocker-java:masterfrom
jrrickard:issue584
Jun 2, 2016
Merged

Add RootDir property to GraphData#585
marcuslinke merged 4 commits intodocker-java:masterfrom
jrrickard:issue584

Conversation

@jrrickard
Copy link
Copy Markdown
Contributor

@jrrickard jrrickard commented May 24, 2016

Adds RootDir property to GraphData.

This was seen on a CentOS system without aufs support.


This change is Reviewable

Adds RootDir property to GraphData. This was seen on a
CentOS system without aufs support.
@jrrickard
Copy link
Copy Markdown
Contributor Author

Ooops, sorry. Looks like I forgot to turn off my team's code formatter. Let me swap and resubmit

Adds RootDir property to GraphData. This was seen on a
CentOS system without aufs support.
import org.apache.commons.lang.builder.ToStringBuilder;

import javax.annotation.CheckForNull;
import com.fasterxml.jackson.annotation.JsonProperty;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please don't reorder imports

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah sorry, that was my other code formatter.

@KostyaSha
Copy link
Copy Markdown
Member

Please remove all coding style changes.

@KostyaSha
Copy link
Copy Markdown
Member

IDEA default or eclipse would mostly match, for eclipse some config file even committed in repository. For idea i still had no time, sorry for it. Formatting really makes difficult reviews.

@jrrickard
Copy link
Copy Markdown
Contributor Author

@KostyaSha yeah sorry, going to reformat and resubmit. I found the code style under the /etc directory. Reformatting with that.

Adds RootDir property to GraphData. This was seen on a
CentOS system without aufs support.
@codecov-io
Copy link
Copy Markdown

codecov-io commented May 24, 2016

Current coverage is 23.18%

Merging #585 into master will increase coverage by <.01%

  1. File ...and/GraphDriver.java (not in diff) was modified. more
    • Misses -2
    • Partials 0
    • Hits +2
@@             master       #585   diff @@
==========================================
  Files           296        296          
  Lines          6157       6160     +3   
  Methods           0          0          
  Messages          0          0          
  Branches        539        539          
==========================================
+ Hits           1423       1428     +5   
+ Misses         4642       4640     -2   
  Partials         92         92          

Powered by Codecov. Last updated by 0758623...9b8ca72

return rootDir;
}

/**
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please fix comment. Thanks.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, just amended to fix that. Sorry!

@KostyaSha
Copy link
Copy Markdown
Member

Now looks good :) Please ignore commit status, it was PR builder against docker-beta that i started configuring :)

Adds RootDir property to GraphData. This was seen on a
CentOS system without aufs support.
@marcuslinke marcuslinke merged commit d05e380 into docker-java:master Jun 2, 2016
@marcuslinke marcuslinke changed the title Fixes Issue #584 Add RootDir property to GraphData Jun 2, 2016
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.

4 participants