Skip to content

Conversation

shin-
Copy link
Contributor

@shin- shin- commented Sep 12, 2015

No description provided.

@shin- shin- self-assigned this Sep 12, 2015
@shin- shin- added this to the 1.5.0 milestone Sep 12, 2015
@shin- shin- removed the status/wip label Sep 15, 2015
@shin- shin- changed the title [WIP] Support API version 1.20 Support API version 1.20 Sep 15, 2015
@aanand
Copy link
Contributor

aanand commented Sep 16, 2015

Those snippets look near-identical. Maybe there should be a test utility method?

def get_volume_info(container, destination, version):
    """
    Takes a container dictionary and volume destination path
    and returns a tuple of (rw, origin), using the appropriate
    fields for the specified API version
    """
    if docker.utils.compare_version('1.20', version) < 0:
        # old logic
    else:
        # new logic

Signed-off-by: Joffrey F <joffrey@docker.com>
Signed-off-by: Joffrey F <joffrey@docker.com>
@shin- shin- removed the status/wip label Sep 22, 2015
Copy link
Contributor

Choose a reason for hiding this comment

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

This seems to be a duplicate of the line above - merge conflict resolution mishap?

@aanand
Copy link
Contributor

aanand commented Sep 23, 2015

Duplicate line aside, LGTM

Signed-off-by: Joffrey F <joffrey@docker.com>
shin- added a commit that referenced this pull request Sep 23, 2015
@shin- shin- merged commit 02f330d into master Sep 23, 2015
@shin- shin- deleted the api_1.20_support branch November 12, 2015 19:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants