Syncing my fork (this CL has no changes). #73

aozarov · 2015-05-20T03:29:33Z

No description provided.

Conflicts: .gitignore git-demo.iml src/main/java/com/google/gcloud/RetryHelper.java

Basic tests

coveralls · 2015-05-20T03:46:22Z

Coverage increased (+1.96%) to 70.29% when pulling aed7a71 on aozarov:master into 7738e54 on GoogleCloudPlatform:master.

jgeewax · 2015-05-20T11:33:09Z

Wait - if there are no changes, why not just ...

$ git pull upstream master  # Where upstream is GoogleCloudPlatform/gcloud-java
$ git push origin -f  # Where origin is aozarov/gcloud-java

?

aozarov · 2015-05-20T15:46:52Z

Yes, please ignore this pull request (I will delete it soon), this is why I didn't assign it to anyone.
It is one of my many attempts to recover my fork from #11

aozarov · 2015-05-20T15:50:50Z

BTW, when I am invoking
$ git pull upstream master # Where upstream is GoogleCloudPlatform/gcloud-java
I get several conflicts:
Auto-merging src/test/java/com/google/gcloud/storage/SerializationTest.java
CONFLICT (add/add): Merge conflict in src/test/java/com/google/gcloud/storage/SerializationTest.java
Auto-merging src/test/java/com/google/gcloud/storage/ListResultTest.java
...
Automatic merge failed; fix conflicts and then commit the result.

Any idea on how to handle those (and basically force taking the upsteam)?

jgeewax · 2015-05-21T10:23:39Z

Seems like this answer makes sense here: http://stackoverflow.com/questions/8134960/how-to-revert-master-branch-to-upstream

…gleapis#73) * chore: update repo-metadata and regenerate README from templates * restore examples

Source-Link: googleapis/synthtool@7a220e2 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:6d4e3a15c62cfdcb823d60e16da7521e7c6fc00eba07c8ff12e4de9924a57d28

This PR was generated using Autosynth. 🌈 Synth log will be available here: https://source.cloud.google.com/results/invocations/44e19739-17d8-49c5-8c3f-c99d2a4544ec/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: googleapis/synthtool@5a506ec

Co-authored-by: Anthonios Partheniou <[email protected]> Source-Link: googleapis/synthtool@72c64b7 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:b2e8f445ca0e605d4bbefbfdbdf7335692d75cf1647af62243828dcc0ea4e690

🤖 I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).

…-info-reports-plugin to v3.4.1 (#73) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-project-info-reports-plugin](https://maven.apache.org/plugins/) | `3.4.0` -> `3.4.1` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.4.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.4.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.4.1/compatibility-slim/3.4.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.4.1/confidence-slim/3.4.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-certificate-manager).

…itcher to v0.3.3 (#73) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-video-stitcher](https://togithub.com/googleapis/java-video-stitcher) | `0.3.2` -> `0.3.3` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-video-stitcher/0.3.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-video-stitcher/0.3.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-video-stitcher/0.3.3/compatibility-slim/0.3.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-video-stitcher/0.3.3/confidence-slim/0.3.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. ⚠ **Warning**: custom changes will be lost. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-video-stitcher).

…1575) (#73) Source-Link: googleapis/synthtool@2e9ac19 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:8175681a918181d306d9c370d3262f16b4c724cc73d74111b7d42fc985ca7f93

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [requests](https://requests.readthedocs.io) ([source](https://togithub.com/psf/requests), [changelog](https://togithub.com/psf/requests/blob/master/HISTORY.md)) | `==2.27.1` -> `==2.28.1` | [![age](https://badges.renovateapi.com/packages/pypi/requests/2.28.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/requests/2.28.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/requests/2.28.1/compatibility-slim/2.27.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/requests/2.28.1/confidence-slim/2.27.1)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. ⚠ **Warning**: custom changes will be lost. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-gke-backup).

#101) …thon 3.6 (#1588) (#73)" This reverts commit 5ed220f. Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly: - [ ] Make sure to open an issue as a [bug/issue](https://togithub.com/googleapis/java-bare-metal-solution/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [ ] Ensure the tests and linter pass - [ ] Code coverage does not decrease (if any source code was changed) - [ ] Appropriate docs were updated (if necessary) Fixes #<issue_number_goes_here> ☕️ If you write sample code, please follow the [samples format]( https://togithub.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md).

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [requests](https://requests.readthedocs.io) ([source](https://togithub.com/psf/requests), [changelog](https://togithub.com/psf/requests/blob/master/HISTORY.md)) | `==2.27.1` -> `==2.28.1` | [![age](https://badges.renovateapi.com/packages/pypi/requests/2.28.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/requests/2.28.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/requests/2.28.1/compatibility-slim/2.27.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/requests/2.28.1/confidence-slim/2.27.1)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. ⚠ **Warning**: custom changes will be lost. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-bigquery-data-exchange).

…thon 3.6 (#1588)" (#73) Reverts googleapis/java-batch#44

aozarov and others added 30 commits January 2, 2015 17:50

Automatically invoke gcd for testing

823eb9f

Merge branch 'master' of https://github.com/aozarov/git-demo

e6f9b76

minor change

14abf09

replace sh with bash

bf4f035

cleanup

e7ce4ea

more cleanup

6019e60

more cleanup

ff2827e

minor fix

7383b89

revert wrong formatting

941c63e

revert wrong formatting

d3a014d

even more cleanup

1178bb0

Merge remote-tracking branch 'origin/master'

995b54a

Conflicts: .gitignore git-demo.iml src/main/java/com/google/gcloud/RetryHelper.java

revert wrong formatting

5325076

Provide an option for an add with auto-id allocation.

0358d21

add git-demo.iml

48c1310

removing git-demo.iml

44f4eb5

batch/transaction submit/commit returns generated keys

98b2391

Provide an option for an add with auto-id allocation.

86201c9

replace local gcd hack with a fixed version of gcd

865a986

replace local gcd hack with a fixed version of gcd

7f16f8a

Adding copyright and README and CONTRIBUTIONS files.

7543e68

adding contributing

ffe96d7

adding travis config file

4929f47

Make travis run verify instead of test

a7b6fb9

change maven group information

8006311

adding travis credentials

5555cc8

apply changes from git-demo

952eec6

return the datastore service from Batch and Transation

a57592c

Delete .project

172c00d

Delete .classpath

461a172

aozarov and others added 8 commits May 14, 2015 17:33

work in progress

0120b6c

basic tests

a1d3172

make Project constructor public

75366f0

s/junit.framework.TestCase/org.junit.Assert/g

52235c1

add tests for bucket and blob

73e01fe

Merge pull request #64 from aozarov/temp

d3d9f32

Basic tests

Merge remote-tracking branch 'upstream/master'

86bf292

merge from upstream

aed7a71

aozarov closed this May 20, 2015

aozarov mentioned this pull request May 30, 2015

Remove binary blobs from history #87

Closed

github-actions bot pushed a commit to suztomo/google-cloud-java that referenced this pull request Jun 29, 2022

chore: update repo-metadata and regenerate README from templates (goo…

a0f9b44

…gleapis#73) * chore: update repo-metadata and regenerate README from templates * restore examples

github-actions bot pushed a commit that referenced this pull request Sep 30, 2022

Revert "chore: pin versions of dependencies for compatibility with Py…

6b36f23

…thon 3.6 (#1588)" (#73) Reverts googleapis/java-batch#44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Syncing my fork (this CL has no changes). #73

Syncing my fork (this CL has no changes). #73

aozarov commented May 20, 2015

coveralls commented May 20, 2015

jgeewax commented May 20, 2015

aozarov commented May 20, 2015

aozarov commented May 20, 2015

jgeewax commented May 21, 2015

Syncing my fork (this CL has no changes). #73

Syncing my fork (this CL has no changes). #73

Conversation

aozarov commented May 20, 2015

coveralls commented May 20, 2015

jgeewax commented May 20, 2015

aozarov commented May 20, 2015

aozarov commented May 20, 2015

jgeewax commented May 21, 2015