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.

Sign up for GitHub

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

Jump to bottom

Fix merge mishap #741

Merged
merged 17 commits into from
Mar 18, 2016
Merged

Fix merge mishap #741

merged 17 commits into from
Mar 18, 2016

Commits on Mar 10, 2016

  1. Fix merge mishap

    @jean-philippe-martin
    jean-philippe-martin committed Mar 10, 2016
    Configuration menu
    Copy the full SHA
    ab18107 View commit details
    Browse the repository at this point in the history

  2. A stab in the dark

    @jean-philippe-martin
    jean-philippe-martin committed Mar 10, 2016
    Configuration menu
    Copy the full SHA
    9dca6dd View commit details
    Browse the repository at this point in the history

  3. Create service-specific spi packages

    @mziccard
    mziccard committed Mar 10, 2016
    Configuration menu
    Copy the full SHA
    407c436 View commit details
    Browse the repository at this point in the history

  4. Add a way to create a mock Blob

    @jean-philippe-martin
    jean-philippe-martin committed Mar 10, 2016
    Configuration menu
    Copy the full SHA
    d3555be View commit details
    Browse the repository at this point in the history

  5. Reorder and add imports

    @mziccard
    mziccard committed Mar 10, 2016
    Configuration menu
    Copy the full SHA
    fd7d84d View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2016

  1. Merge pull request googleapis#742 from mziccard/rename-spi 

    Create service-specific spi packages
    @ajkannan
    ajkannan committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    0d38c67 View commit details
    Browse the repository at this point in the history

  2. Use groups to separate packages in javadoc's index

    @mziccard
    mziccard committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    a595f6a View commit details
    Browse the repository at this point in the history

  3. Add group for testing packages

    @mziccard
    mziccard committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    90d0917 View commit details
    Browse the repository at this point in the history

  4. Rename Main packages to API packages, reorder groups, add service's SPIs

    @mziccard
    mziccard committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    24a712a View commit details
    Browse the repository at this point in the history

  5. Merge pull request googleapis#738 from mziccard/javadoc-group-packages 

    Use groups to separate packages in javadoc's index
    @ajkannan
    ajkannan committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    1425513 View commit details
    Browse the repository at this point in the history

  6. in progress

    @jean-philippe-martin
    jean-philippe-martin committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    b91fe9e View commit details
    Browse the repository at this point in the history

  7. Remove final from Blob 

    So we can mock it in test classes.
Also make equals and hashCode final.
    @jean-philippe-martin
    jean-philippe-martin committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    8a3b4f2 View commit details
    Browse the repository at this point in the history

  8. Merge pull request googleapis#744 from jean-philippe-martin/blob_notf… 

    …inal

Remove final from Blob
    @aozarov
    aozarov committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    ddd02aa View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' into gcs-nio-fix

    @jean-philippe-martin
    jean-philippe-martin committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    f18a886 View commit details
    Browse the repository at this point in the history

  10. Adapt to changes from master

    @jean-philippe-martin
    jean-philippe-martin committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    3d61bd1 View commit details
    Browse the repository at this point in the history

  11. Add FileSystemProvider, tests now pass

    @jean-philippe-martin
    jean-philippe-martin committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    e65b2d8 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2016

  1. Remove spi.FileSystemProvider

    @jean-philippe-martin
    jean-philippe-martin committed Mar 17, 2016
    Configuration menu
    Copy the full SHA
    a5e0286 View commit details
    Browse the repository at this point in the history