Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rebase release branch to master branch #1400

Closed
wants to merge 2 commits into from
Closed

Rebase release branch to master branch #1400

wants to merge 2 commits into from

Conversation

gargnitingoogle
Copy link
Collaborator

@gargnitingoogle gargnitingoogle commented Sep 27, 2023 •
edited
Loading

Rebase release branch to master to keep it up-to-date with the changes on master branch.

@Tulsishah
Updating troubleshooting doc for permission issue (#1395)
4b8ed76 
* updating troubleshooting doc

* fixing comment

* adding example

* formating

* formating

* fixing comment

* formating

* formating
@github-advanced-security
Copy link

This pull request sets up GitHub code scanning for this repository. Once the scans have completed and the checks have passed, the analysis results for this pull request branch will appear on this overview. Once you merge this pull request, the 'Security' tab will show more code scanning analysis results (for example, for the default branch). Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results. For more information about GitHub code scanning, check out the documentation.

@google-cla
Copy link

google-cla bot commented Sep 27, 2023

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@gargnitingoogle gargnitingoogle changed the title Updating troubleshooting doc for permission issue (#1395) Back-merge from master to release branch Sep 27, 2023
vadlakondaswetha
vadlakondaswetha reviewed Sep 27, 2023
View reviewed changes
Copy link
Collaborator

@vadlakondaswetha vadlakondaswetha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should do re-base and not merge

@gargnitingoogle gargnitingoogle changed the title Back-merge from master to release branch Rebase release branch to master branch Sep 27, 2023
@gargnitingoogle
Copy link
Collaborator Author

We should do re-base and not merge

I planned to rebase (rebase and merge) only, not merge. I've now changed the title and the description accordingly.

gargnitingoogle added a commit that referenced this pull request Sep 28, 2023
@gargnitingoogle
Fix linter errors
8f68ec8 
This commit and others in this branch fix
the lint errors popping up in
#1400
to unblock this PR, to allow rebase other branches
to master without getting stuck on linter errors.

Changes
* Remove io.util usage from contentcache
@gargnitingoogle gargnitingoogle mentioned this pull request Sep 28, 2023
Merged
gargnitingoogle added a commit that referenced this pull request Sep 28, 2023
@gargnitingoogle
Fix linter errors
4b81263 
This commit and others in this branch fix
the lint errors popping up in
#1400
to unblock this PR, to allow rebase other branches
to master without getting stuck on linter errors.

Changes
* Remove io.util usage from contentcache
* fix formatting issue in name.go
* fix formatting issue in type_cache.go
* add missing error-check in file_test.go
* remove reference to ioutil in auth.go
* remove reference to ioutil in proxy.go
* remove unnecessary assignment to blank identifier
* remove unnecessary int64 check vs maxInt64
* remove reference to deprecated io/ioutil
* add missing return-error-check
gargnitingoogle added a commit that referenced this pull request Sep 28, 2023
@gargnitingoogle
Fix linter errors
8dcf3ed 
This commit fixes the linter errors popping up in
#1400
to unblock this PR, to allow rebase other branches
to master without getting stuck on linter errors.

Changes
* Remove io.util usage from contentcache
* fix formatting issue in name.go
* fix formatting issue in type_cache.go
* add missing error-check in file_test.go
* remove reference to ioutil in auth.go
* remove reference to ioutil in proxy.go
* remove unnecessary assignment to blank identifier
* remove unnecessary int64 check vs maxInt64
* remove reference to deprecated io/ioutil
* add missing return-error-check
gargnitingoogle added a commit that referenced this pull request Sep 28, 2023
@gargnitingoogle
Fix linter errors
47d020b 
This commit fixes the linter errors popping up in
#1400
to unblock this PR, to allow rebase other branches
to master without getting stuck on linter errors.

Changes
* Remove io.util usage from contentcache
* fix formatting issue in name.go
* fix formatting issue in type_cache.go
* add missing error-check in file_test.go
* remove reference to ioutil in auth.go
* remove reference to ioutil in proxy.go
* remove unnecessary assignment to blank identifier
* remove unnecessary int64 check vs maxInt64
* remove reference to deprecated io/ioutil
* add missing return-error-check
@gargnitingoogle
Copy link
Collaborator Author

This is blocked on #1403 .

gargnitingoogle added a commit that referenced this pull request Sep 28, 2023
@gargnitingoogle
Fix linter errors
1d7bb4e 
This commit fixes the linter errors popping up in
#1400
to unblock this PR, to allow rebase other branches
to master without getting stuck on linter errors.

Changes
* Remove io.util usage from contentcache
* fix formatting issue in name.go
* fix formatting issue in type_cache.go
* add missing error-check in file_test.go
* remove reference to ioutil in auth.go
* remove reference to ioutil in proxy.go
* remove unnecessary assignment to blank identifier
* remove unnecessary int64 check vs maxInt64
* remove reference to deprecated io/ioutil
* add missing return-error-check
@gargnitingoogle
Fix linter errors
66b8100 
This commit fixes the linter errors popping up in
#1400
to unblock this PR, to allow rebase other branches
to master without getting stuck on linter errors.

Changes
* Remove io.util usage from contentcache
* fix formatting issue in name.go
* fix formatting issue in type_cache.go
* add missing error-check in file_test.go
* remove reference to ioutil in auth.go
* remove reference to ioutil in proxy.go
* remove unnecessary assignment to blank identifier
* remove unnecessary int64 check vs maxInt64
* remove reference to deprecated io/ioutil
* add missing return-error-check
gargnitingoogle added a commit that referenced this pull request Sep 29, 2023
@gargnitingoogle
Fix linter errors
faf9fe0 
This commit fixes the linter errors popping up in
#1400
to unblock this PR, to allow rebase other branches
to master without getting stuck on linter errors.

Details of changes
* add missing error-return-check
* remove references to deprecated ioutil package
@gargnitingoogle gargnitingoogle mentioned this pull request Sep 29, 2023
Open
gargnitingoogle added a commit that referenced this pull request Sep 29, 2023
@gargnitingoogle
Fix linter errors
76bf68d 
This commit fixes the linter errors popping up in
#1400
to unblock this PR, to allow rebase other branches
to master without getting stuck on linter errors.

Details of changes
* add missing error-return-check
* remove references to deprecated ioutil package
gargnitingoogle added a commit that referenced this pull request Sep 29, 2023
@gargnitingoogle
Fix linter errors
4dd9e71 
This commit fixes the linter errors popping up in
#1400
to unblock this PR, to allow rebase other branches
to master without getting stuck on linter errors.

Details of changes
* add missing error-return-check
* remove references to deprecated ioutil package
gargnitingoogle added a commit that referenced this pull request Sep 29, 2023
@gargnitingoogle
Fix linter errors
15b6601 
This commit fixes the linter errors popping up in
#1400
to unblock this PR, to allow rebase other branches
to master without getting stuck on linter errors.

Details of changes
* add missing error-return-check
* remove references to deprecated ioutil package
@gargnitingoogle
Copy link
Collaborator Author

Closing this as this is not a good idea. Rebasing release branch to master branch head will make the reverse more difficult (as it'll cause conflicts), which is required for getting all features meant for release into the master branch.

@gargnitingoogle
Copy link
Collaborator Author

Closing.

gargnitingoogle added a commit that referenced this pull request Oct 30, 2023
@gargnitingoogle
Fix linter errors
6d4f2a4 
This commit fixes the linter errors popping up in
#1400
to unblock this PR, to allow rebase other branches
to master without getting stuck on linter errors.

Changes
* Remove io.util usage from contentcache
* fix formatting issue in name.go
* fix formatting issue in type_cache.go
* add missing error-check in file_test.go
* remove reference to ioutil in auth.go
* remove reference to ioutil in proxy.go
* remove unnecessary assignment to blank identifier
* remove unnecessary int64 check vs maxInt64
* remove reference to deprecated io/ioutil
* add missing return-error-check
gargnitingoogle added a commit that referenced this pull request Oct 31, 2023
@gargnitingoogle
Fix linter errors
dbbfcdb 
This commit fixes the linter errors popping up in
#1400
to unblock this PR, to allow rebase other branches
to master without getting stuck on linter errors.

Changes
* Remove io.util usage from contentcache
* fix formatting issue in name.go
* fix formatting issue in type_cache.go
* add missing error-check in file_test.go
* remove reference to ioutil in auth.go
* remove reference to ioutil in proxy.go
* remove unnecessary assignment to blank identifier
* remove unnecessary int64 check vs maxInt64
* remove reference to deprecated io/ioutil
* add missing return-error-check
gargnitingoogle added a commit that referenced this pull request Nov 1, 2023
@gargnitingoogle
Fix linter errors
7525093 
This commit fixes the linter errors popping up in
#1400
to unblock this PR, to allow rebase other branches
to master without getting stuck on linter errors.

Changes
* Remove io.util usage from contentcache
* fix formatting issue in name.go
* fix formatting issue in type_cache.go
* add missing error-check in file_test.go
* remove reference to ioutil in auth.go
* remove reference to ioutil in proxy.go
* remove unnecessary assignment to blank identifier
* remove unnecessary int64 check vs maxInt64
* remove reference to deprecated io/ioutil
* add missing return-error-check
gargnitingoogle added a commit that referenced this pull request Nov 28, 2023
@gargnitingoogle
Fix linter errors
1c0a53b 
This commit fixes the linter errors popping up in
#1400
to unblock this PR, to allow rebase other branches
to master without getting stuck on linter errors.

Changes
* Remove io.util usage from contentcache
* fix formatting issue in name.go
* fix formatting issue in type_cache.go
* add missing error-check in file_test.go
* remove reference to ioutil in auth.go
* remove reference to ioutil in proxy.go
* remove unnecessary assignment to blank identifier
* remove unnecessary int64 check vs maxInt64
* remove reference to deprecated io/ioutil
* add missing return-error-check
gargnitingoogle added a commit that referenced this pull request Nov 29, 2023
@gargnitingoogle
Fix linter errors
35c963c 
This commit fixes the linter errors popping up in
#1400
to unblock this PR, to allow rebase other branches
to master without getting stuck on linter errors.

Changes
* Remove io.util usage from contentcache
* fix formatting issue in name.go
* fix formatting issue in type_cache.go
* add missing error-check in file_test.go
* remove reference to ioutil in auth.go
* remove reference to ioutil in proxy.go
* remove unnecessary assignment to blank identifier
* remove unnecessary int64 check vs maxInt64
* remove reference to deprecated io/ioutil
* add missing return-error-check
gargnitingoogle added a commit that referenced this pull request Nov 29, 2023
@gargnitingoogle
Fix linter errors
3ae0435 
This commit fixes the linter errors popping up in
#1400
to unblock this PR, to allow rebase other branches
to master without getting stuck on linter errors.

Changes
* Remove io.util usage from contentcache
* fix formatting issue in name.go
* fix formatting issue in type_cache.go
* add missing error-check in file_test.go
* remove reference to ioutil in auth.go
* remove reference to ioutil in proxy.go
* remove unnecessary assignment to blank identifier
* remove unnecessary int64 check vs maxInt64
* remove reference to deprecated io/ioutil
* add missing return-error-check
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vadlakondaswetha vadlakondaswetha vadlakondaswetha left review comments

@sethiay sethiay Awaiting requested review from sethiay sethiay is a code owner

@raj-prince raj-prince Awaiting requested review from raj-prince raj-prince is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@gargnitingoogle @vadlakondaswetha @Tulsishah