You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@accumulo.apache.org by GitBox <gi...@apache.org> on 2020/02/04 20:43:15 UTC
[GitHub] [accumulo] EdColeman opened a new pull request #1500: Gc metrics
cleanup merge from 1.9
EdColeman opened a new pull request #1500: Gc metrics cleanup merge from 1.9
URL: https://github.com/apache/accumulo/pull/1500
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [accumulo] EdColeman merged pull request #1500: Gc metrics cleanup
merge from 1.9
Posted by GitBox <gi...@apache.org>.
EdColeman merged pull request #1500: Gc metrics cleanup merge from 1.9
URL: https://github.com/apache/accumulo/pull/1500
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [accumulo] ctubbsii commented on issue #1500: Gc metrics cleanup
merge from 1.9
Posted by GitBox <gi...@apache.org>.
ctubbsii commented on issue #1500: Gc metrics cleanup merge from 1.9
URL: https://github.com/apache/accumulo/pull/1500#issuecomment-582674152
Fixed merge in a6230566ef784b27adbf19b83c6a7099c8f0a77a.
See the two missing commits from 1.9 which were intended to be added by this PR now added with:
```bash
git log 0f78b2df5d90ba4a68e8f93061f743059ffded8f..a6230566ef784b27adbf19b83c6a7099c8f0a77a
```
See that the new commits didn't change anything:
```bash
git diff 0f78b2df5d90ba4a68e8f93061f743059ffded8f..a6230566ef784b27adbf19b83c6a7099c8f0a77a
```
Note: it's also the same as the merge commit above, which got squashed out, 40aae1efe6320bf5a60002127a8abe8378a24c9f
```bash
git diff 40aae1efe6320bf5a60002127a8abe8378a24c9f..a6230566ef784b27adbf19b83c6a7099c8f0a77a
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [accumulo] ctubbsii commented on issue #1500: Gc metrics cleanup
merge from 1.9
Posted by GitBox <gi...@apache.org>.
ctubbsii commented on issue #1500: Gc metrics cleanup merge from 1.9
URL: https://github.com/apache/accumulo/pull/1500#issuecomment-582670861
I see branch at merge commit 40aae1efe6320bf5a60002127a8abe8378a24c9f, which did not get fast-forward merged into master, is identical to the branch at commit 0f78b2df5d90ba4a68e8f93061f743059ffded8f that made it in. I think this was a merge error, because the GitHub UI was used to squash the commits when merging from 1.9 into 2.1/master.
In future, it's probably best to avoid using the GitHub UI to merge from an older branch into a newer one. The commit 40aae1efe6320bf5a60002127a8abe8378a24c9f could have been pushed directly to the master branch, and GitHub would have automatically detected the commit was merged and closed this PR.
I will resolve this by creating a new (empty) merge commit to make sure all commits in 1.9 are included in the history of 2.1/master.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [accumulo] ctubbsii edited a comment on issue #1500: Gc metrics
cleanup merge from 1.9
Posted by GitBox <gi...@apache.org>.
ctubbsii edited a comment on issue #1500: Gc metrics cleanup merge from 1.9
URL: https://github.com/apache/accumulo/pull/1500#issuecomment-582670861
I see branch at merge commit 40aae1efe6320bf5a60002127a8abe8378a24c9f, which did not get fast-forward merged into master, is identical to the branch at commit 0f78b2df5d90ba4a68e8f93061f743059ffded8f that made it in. I think this was a merge error, because the GitHub UI was used to squash the commits when merging from 1.9 into 2.1/master.
In future, it's probably best to avoid using the GitHub UI to merge from an older branch into a newer one (at the very least, don't choose the squash option when doing so, but probably best to avoid it entirely). The commit 40aae1efe6320bf5a60002127a8abe8378a24c9f could have been pushed directly to the master branch, and GitHub would have automatically detected the commit was merged and closed this PR.
I will resolve this by creating a new (empty) merge commit to make sure all commits in 1.9 are included in the history of 2.1/master.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [accumulo] ctubbsii edited a comment on issue #1500: Gc metrics
cleanup merge from 1.9
Posted by GitBox <gi...@apache.org>.
ctubbsii edited a comment on issue #1500: Gc metrics cleanup merge from 1.9
URL: https://github.com/apache/accumulo/pull/1500#issuecomment-582674152
Fixed merge in a6230566ef784b27adbf19b83c6a7099c8f0a77a.
See the two missing commits from 1.9 which were intended to be added by this PR now added with:
```bash
git log 0f78b2df5d90ba4a68e8f93061f743059ffded8f..a6230566ef784b27adbf19b83c6a7099c8f0a77a
```
See that the new commits didn't change anything from the squashed commit that got merged instead (0f78b2df5d90ba4a68e8f93061f743059ffded8f):
```bash
git diff 0f78b2df5d90ba4a68e8f93061f743059ffded8f..a6230566ef784b27adbf19b83c6a7099c8f0a77a
```
See that it's also the same as the merge commit above, which got squashed out (40aae1efe6320bf5a60002127a8abe8378a24c9f):
```bash
git diff 40aae1efe6320bf5a60002127a8abe8378a24c9f..a6230566ef784b27adbf19b83c6a7099c8f0a77a
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services