Fixing merge conflict in README.md

googleapis · Oct 8, 2015 · 26fb875 · 26fb875
2 parents 59722fa + c6b7f27
commit 26fb875
Show file tree

Hide file tree

Showing 8 changed files with 818 additions and 89 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,8 @@ before_install:
 - git clone -b travis `git config --get remote.origin.url` target/travis
 - cp target/travis/settings.xml ~/.m2/settings.xml
 install: mvn install -DskipTests=true -Dgpg.skip=true
-script: mvn verify
+script: 
+- utilities/verify.sh
 branches:
   only:
   - master

diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java
@@ -21,15 +21,15 @@
  * <pre>{@code
  * StorageOptions options = StorageOptions.builder().projectId("project").build();
  * Storage storage = StorageFactory.instance().get(options);
- * byte[] content = readContent();
- * BlobInfo blobInfo = storage.get("bucket", "blob_name");
- * if (blobInfo == null) {
- *   storage.create(BlobInfo.of("bucket", "blob_name"), content);
+ * Blob blob = new Blob(storage, "bucket", "blob_name");
+ * if (!blob.exists()) {
+ *   storage.create(blob.info(), "Hello, Cloud Storage!".getBytes(UTF_8));
  * } else {
- *   byte[] prevContent = storage.readAllBytes("bucket", "blob_name");
- *   content = mergeContent(prevContent, content);
- *   WritableByteChannel channel = storage.writer(blob);
- *   channel.write(ByteBuffer.wrap(content));
+ *   System.out.println("Updating content for " + blob.info().name());
+ *   byte[] prevContent = blob.content();
+ *   System.out.println(new String(prevContent, UTF_8));
+ *   WritableByteChannel channel = blob.writer();
+ *   channel.write(ByteBuffer.wrap("Updated content".getBytes(UTF_8)));
  *   channel.close();
  * }}</pre>
  *