Skip to content

Commit 26fb875

Browse files
author
Ajay Kannan
committed
Fixing merge conflict in README.md
2 parents 59722fa + c6b7f27 commit 26fb875

8 files changed

Lines changed: 818 additions & 89 deletions

File tree

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ before_install:
88
- git clone -b travis `git config --get remote.origin.url` target/travis
99
- cp target/travis/settings.xml ~/.m2/settings.xml
1010
install: mvn install -DskipTests=true -Dgpg.skip=true
11-
script: mvn verify
11+
script:
12+
- utilities/verify.sh
1213
branches:
1314
only:
1415
- master

gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java

Lines changed: 76 additions & 74 deletions
Large diffs are not rendered by default.

gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
* <pre>{@code
2222
* StorageOptions options = StorageOptions.builder().projectId("project").build();
2323
* Storage storage = StorageFactory.instance().get(options);
24-
* byte[] content = readContent();
25-
* BlobInfo blobInfo = storage.get("bucket", "blob_name");
26-
* if (blobInfo == null) {
27-
* storage.create(BlobInfo.of("bucket", "blob_name"), content);
24+
* Blob blob = new Blob(storage, "bucket", "blob_name");
25+
* if (!blob.exists()) {
26+
* storage.create(blob.info(), "Hello, Cloud Storage!".getBytes(UTF_8));
2827
* } else {
29-
* byte[] prevContent = storage.readAllBytes("bucket", "blob_name");
30-
* content = mergeContent(prevContent, content);
31-
* WritableByteChannel channel = storage.writer(blob);
32-
* channel.write(ByteBuffer.wrap(content));
28+
* System.out.println("Updating content for " + blob.info().name());
29+
* byte[] prevContent = blob.content();
30+
* System.out.println(new String(prevContent, UTF_8));
31+
* WritableByteChannel channel = blob.writer();
32+
* channel.write(ByteBuffer.wrap("Updated content".getBytes(UTF_8)));
3333
* channel.close();
3434
* }}</pre>
3535
*

0 commit comments

Comments
 (0)