Skip to content

Commit 47c7dc9

Browse files
aozarovaozarov
committed
---
yaml --- r: 6195 b: refs/heads/tswast-patch-1 c: d82500d h: refs/heads/master i: 6193: 610e819 6191: 9176341
1 parent e74eca0 commit 47c7dc9

5 files changed

Lines changed: 12 additions & 6 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
5757
refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
5858
refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
5959
refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
60-
refs/heads/tswast-patch-1: 36f2867dbf16b82f9ab6d62db79d835d7470d095
60+
refs/heads/tswast-patch-1: d82500d1409dc58dd0fdeb34d015cd8a4068ae84
6161
refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b

‎branches/tswast-patch-1/.travis.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ jdk:
66
before_install:
77
- mvn clean
88
- git clone -b travis `git config --get remote.origin.url` target/travis
9+
- openssl aes-256-cbc -K $encrypted_631490ecae8f_key -iv $encrypted_631490ecae8f_iv -in target/travis/signing-tools.tar.enc -out target/travis/signing-tools.tar -d
10+
- mkdir target/travis/signing-tools
11+
- chmod 700 target/travis/signing-tools
12+
- tar xvf target/travis/signing-tools.tar -C target/travis/signing-tools
913
- cp target/travis/settings.xml ~/.m2/settings.xml
1014
install: mvn install -DskipTests=true -Dgpg.skip=true
1115
script: mvn verify
@@ -20,3 +24,5 @@ env:
2024
- secure: "CUM2l73KFm7U4eDsUKkh1WyEUzF3v94Ltvs7MnKU9olE1dNp3YmRBL9Lqhx3hSDqm/xv0ETQsPy29Fs2+VFkhQQxSley6iS/4trr2fioTB680txfXo/zDdmGSP1q1/U40fv1S+jvuBRAhDV5W+8dhWOGtzMH0tJp/TszeDGlmCY="
2125
- secure: "YBbdzseg5yDFpQIiMoc3P2BTmqef4o+KAvrLMEbobXjIkiglUQ7UHCoRWClX74fTKAwuC7JvK7o5xJGLnaY43jJADXrGtE8/d44HNJaieE67mNosDYtOiA0iI2uIRFCAnXJCZ8f/iHx2xVMHMNWlwyoil4IUcjj+D7FRcsT5alE="
2226
- secure: "Od7BwllgFXVfzFe8ooTNm05TR+Xd5QjHW0oqhU8vclaQs2oX4e0eNIsebXQfLi3xDgd1pz5uUQC/Z4S0NqACwyUuUvPdGYYmRPTR7Dh8HgGJ4ojSdN3RwaHsxUqG7Ajts9rIHOtRpY28xOChVRNX0Z7eAPlvxYU4Ed2ZEo356r0="
27+
- secure: "PZ7dnp9Gp5HY1Iu5Z5n/wjkArWExJ958hC60nzE/r7uh9iRIEbIfbWW5KTkqlmxTsTVUR5JH2hjqu9C/0A3PU+ctfbO+fO3MegRgQbWJPfoOeLzw23xvnpdvkVPajHYudoVrVyS9KaAqRZoCaIpZiH6sQpZ7jrPaOOA/IPTnqYSpRDyVsXiiFE/Gyu48e93AxDn8D1BirX/DQRSZSTTwJfwbmz6ZDCFhI3MEZuCnvN4eGydk/bGPLZFpjB9TRxvAtN5TDTifgt8JaWE1t3hIi+EwZCyqYRiVI1ps5nyVdpKisX6E133n918kVO8lXVCMGPlEJ8qq8uFA/Pvz/7iKDmE/8wa3vnM4AkZTMi45TViEPk8z7e+zOJA1XpV2tQ8FBzk7kBEkKYZJ6aYXJruKQTKMW0YwrA5856xLnCiGaqsXnuXroOWrhifTI9gjjoi6kwcOTtwqZysdf1P7dgpq4qRgxpO34oGeSR3+ely300xSPwibX+Uga1Rw/oy47wbxWfWiEd3c5CTwz+Zge7X23Yy6Fud/1yuia6N8Bas+xYBaBRQxDo/CD2qjOyz+aH5LNTncw97M3jRCcH2BQVZom0AIiiCWLdKYH/yMXZCMxhOB+Shp1XtmFL5yX6GM7ufZPRZSHRdM/GsYxC9OG2DyUIXrg6dRfrfHNlVDnNqbMXc="
28+
- secure: "QXBoSPtLHACEtzUm/KbfkmXE8yHoKjl+cSlCZmByGpIOnE0XvbbuvS3VAI7fOpWsny5r0kqpNO1+3efjoR48pXj/OTf0BFuaj62kdDkaU1MsxUe//QdUbkD6eibmxvO1/RsZYhH3ZYg9TeVRW3/fc0v4Cv+1/ZbA6iVCTWijYqeSNCWDAm685R3Twm0HcXodjUfanF+u8NLltjMeg3E3O9QskRBxo72zTP4sh30yap/ngkifTNI6AP5+S6dKgHc1Uinzm9o9p1LOIWn1xDhk5o17B5Uy5cw2B1wOlPFc8ZlrOzJAsC3KQEh1rq5sNXLkm2kevQQLsw1yjUagxjRSJBizh3OYaP5EFFr9iC80W7Is/OEvkAicFz8jswUpFKuKdnLdglOu5ZiQYQ2d4FQR2dq0GraOfUk0UVxw1RIW75eoUh8vfSPInWZkQ+kfa4OJEwhSR5jwURd76kYHaFyXwU7zgG3/JTePTSXGCfdWAbaKG43nEf6Kmz6my1VCQmwhWdrCNna/VD8YN49TKKlNj9b2A88mHmEqnHHL6xtvR7JqUF1I6WKmQqb9z1VCV9hHgVfPJro+PAer5Qrb6mFkSdg1JNv+aIIz3fEXX0SLbQyrRsWbnAR8kfO6wN4uT7RcGn/5q/vphxcUdU1klJ4bs/GQVFxWt12DfMmcMrqcf/M="

‎branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ public void write(String uploadId, byte[] toWrite, int toWriteOffset, StorageObj
451451
long destOffset, int length, boolean last) throws StorageException {
452452
try {
453453
GenericUrl url = new GenericUrl(uploadId);
454-
HttpRequest httpRequest = storage.getRequestFactory().buildPostRequest(url,
454+
HttpRequest httpRequest = storage.getRequestFactory().buildPutRequest(url,
455455
new ByteArrayContent(null, toWrite, toWriteOffset, length));
456456
long limit = destOffset + length;
457457
StringBuilder range = new StringBuilder("bytes ");

‎branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/spi/StorageRpc.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ enum Option {
3434
PREDEFINED_DEFAULT_OBJECT_ACL("predefinedDefaultObjectAcl"),
3535
IF_METAGENERATION_MATCH("ifMetagenerationMatch"),
3636
IF_METAGENERATION_NOT_MATCH("ifMetagenerationNotMatch"),
37-
IF_GENERATION_NOT_MATCH("ifGenerationMatch"),
38-
IF_GENERATION_MATCH("ifGenerationNotMatch"),
37+
IF_GENERATION_MATCH("ifGenerationMatch"),
38+
IF_GENERATION_NOT_MATCH("ifGenerationNotMatch"),
3939
IF_SOURCE_METAGENERATION_MATCH("ifSourceMetagenerationMatch"),
4040
IF_SOURCE_METAGENERATION_NOT_MATCH("ifSourceMetagenerationNotMatch"),
4141
IF_SOURCE_GENERATION_MATCH("ifSourceGenerationMatch"),

‎branches/tswast-patch-1/utilities/after_success.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ if [ "${TRAVIS_JDK_VERSION}" == "oraclejdk7" -a "${TRAVIS_BRANCH}" == "master" -
2828
git config --global push.default simple
2929
git push --quiet "https://${CI_DEPLOY_USERNAME}:${CI_DEPLOY_PASSWORD}@github.com/GoogleCloudPlatform/gcloud-java.git" > /dev/null 2>&1
3030

31-
# Update versions README and pom.xml in master branch
3231
cd ..
33-
utilities/update_docs_version.sh
32+
utilities/update_docs_version.sh # Update version in READMEs
33+
mvn deploy --settings target/travis/settings.xml -P sign-deploy
3434
else
3535
mvn deploy -DskipTests=true -Dgpg.skip=true --settings target/travis/settings.xml
3636
fi

0 commit comments

Comments
 (0)