Visitar URL original

Fix merge mishap by jean-philippe-martin · Pull Request #741 · googleapis/google-cloud-java · GitHub

Repository navigation

Fix merge mishap - #741

Merged

aozarov merged 17 commits into

googleapis:gcs-niofrom

jean-philippe-martin:gcs-nio-fix

Mar 18, 2016

Merged

Fix merge mishap#741
aozarov merged 17 commits into
googleapis:gcs-niofrom
jean-philippe-martin:gcs-nio-fix

Commits on Mar 10, 2016
- Fix merge mishap
  jean-philippe-martin
  committed
  ab18107
- A stab in the dark
  jean-philippe-martin
  committed
  9dca6dd
- Create service-specific spi packages
  mziccard
  committed
  407c436
- Add a way to create a mock Blob
  jean-philippe-martin
  committed
  d3555be
- Reorder and add imports
  mziccard
  committed
  fd7d84d
Commits on Mar 11, 2016
- Merge pull request #742 from mziccard/rename-spi
  ajkannan
  committed
  0d38c67
- Use groups to separate packages in javadoc's index
  mziccard
  committed
  a595f6a
- Add group for testing packages
  mziccard
  committed
  90d0917
- Rename Main packages to API packages, reorder groups, add service's SPIs
  mziccard
  committed
  24a712a
- Merge pull request #738 from mziccard/javadoc-group-packages
  ajkannan
  committed
  1425513
- in progress
  jean-philippe-martin
  committed
  b91fe9e
- Remove final from Blob
  jean-philippe-martin
  committed
  8a3b4f2
- Merge pull request #744 from jean-philippe-martin/blob_notfinal
  aozarov
  committed
  ddd02aa
- Merge branch 'master' into gcs-nio-fix
  jean-philippe-martin
  committed
  f18a886
- Adapt to changes from master
  jean-philippe-martin
  committed
  3d61bd1
- Add FileSystemProvider, tests now pass
  jean-philippe-martin
  committed
  e65b2d8
Commits on Mar 17, 2016
- Remove spi.FileSystemProvider
  jean-philippe-martin
  committed
  a5e0286