-
Sub-task
-
Resolution: Done
-
Blocker
-
None
-
devex #113 April 2016
-
1
For JBIDE 4.4.0.Alpha1 [OpenShift]: Ensure all commits pushed to jbosstools-4.3.x have either been made in master, or are intentionally excluded from master.
Below are listed all commits made to jbosstools-4.3.x that have not been found in master. It is possible these commits do exist in master, but the patches are not identical. It is also possible that the commits made in jbosstools-4.3.x are not relevant to master or should not be applied.
If there are no commits listed below, please close (do not resolve) this issue.
Otherwise:
1) Click on each link below.
2) Evaluate whether the given commit should be in master
3) If it should be in master, please find out why it is not in master. You may need to browse master's commit log to find a commit that should match.
4) If you cannot find a matching commit, and it should be committed to master, please cherry-pick that commit to master or otherwise merge it in.
5) In comments, please indicate any suspicious commits (ie, commits not related to simple version changes), whether it exists in master, whether you have successfully merged it in now, or whether it is not intended to be committed to master or is inappropriate for master.
6) When all complete, please close (do not resolve) this issue.
Folder: jbosstools-openshift at https://github.com/jbosstools/jbosstools-openshift/
Searching for commits present in jbosstools-4.3.x and missing from master
Commit hash "8e29d0" is the last common ancestor of jbosstools-4.3.x and master
8e29d0 is 409 commits ago in branch master
8e29d0 is 394 commits ago in branch jbosstools-4.3.x
Commits missing from master that are in jbosstools-4.3.x:
- https://github.com/jbosstools/jbosstools-openshift//commit/9f74be7e9e62b7693bad460a16e94c7abfb3669d false positive (https://github.com/jbosstools/jbosstools-openshift/commit/e95668e54ab25208952dd7d8ac4dc221881a3dc5)
- https://github.com/jbosstools/jbosstools-openshift//commit/e0f8e68a5639054403c459ec7a79f85a5fc8cccf false positive (https://github.com/jbosstools/jbosstools-openshift/commit/fec63f7c28f893531a47d645fee0156993b6a358
- https://github.com/jbosstools/jbosstools-openshift//commit/009dcba545a46a802d1f10d33ab39b25f0dd6d04 version change
- https://github.com/jbosstools/jbosstools-openshift//commit/fcdfc9a8da1d9481bb7f9734577641c924ef8f4c minor difference with master
- missing: fcdfc9a8da1d9481bb7f9734577641c924ef8f4c - matched (9825476239f56ce6ee2ea55fd5a6aa5232bc51a8).
- missing: 55c161d3adf09e0c7b33a58644f1c5ca99504b81 - fixed in master
- missing: 2b7e853f34533c91434edda9eac652c566104f10 - fixed in master
- missing: 36cb020dbdb0f6cbd5156a77b914066fc6cebe52 - fixed in master
- missing: 59482980213957c6dbe2450107f834753738bd85 - nearly identical patch
- missing: 6873d3b22fc7342addc0ab1a7d9ea4cffde3cea5 - change of var name from testProject to project
- missing: 5ea17672ab0c1881da7534346e1b0babc3aac812 - identical patch
- missing: 11f974238058d689bf6e30bfc8ec35ae3421b406 - identical patch
- missing: 116a42ee84e118ddd1c22f1b149b36c45abd1c87 - identical patch
- missing: 45c165ff6336459faf2d0d87bd5adf7ee0334e1e - identical patch
- missing: 8f33efc052ae081e2a62a8d544c713abbbdf629f - identical patch
- missing: 760a1f971fc17d022af9d916d3929a8c18eb6c1b - differing in line numbers
- missing: 7dffff362b99f470929e5f70d0e4a4ee68ef5184 - master has null checks surrounding
- missing: dd8a104dd92dc9e411d0e77cebf9ea6ea132aa42 - identical
- missing: 26a1d1e7d918014a1f69d451baddebbbbaa3f749 - different imports
- missing: a3d95ba46eb98c47890a43917b55e946540c44bf - identical patch
- missing: d6a2d2effd2a737e7b9e001b3acd5503d66e1886 - versions
- missing: 8620c1caeeed7407dc55d4ecb3d7367c14e269ff - identical patch
- missing: 9b6e8d60ff1bf6b02eebf7fc28612baecb819965 - seems to be in master
- missing: 8c5a7ead1fa835c9c602c2e69944426641ca9b4e - versioning
- missing: 4206c33ba53c6f1aecb1ff8350a977c48db83d8f false positive https://github.com/jbosstools/jbosstools-openshift/pull/787/commits/3f1b8aefa1a88a79f6f30a1099f8d9932e8e37bb
- missing: bd9c728c6c3a75e0fb580ee4a31e37f8202b4f58 version change
- missing: f51830888169e71144b09ac31714d45afa80e218 version change
- missing: 951590f4f5cf8d004b36e30d460d985be50ed42e irrelevant
- missing: 087f63953adebe164bf22ce2a66dd9a0499693e6 - in master already somehow
- missing: 7a2589b5e1f43f7e933303bf3d73eeb0b0fd9800 - differing in imports
- missing: 14b05efeef623a07ccc5975f315f74b7c4f02f2b - versioning
- missing: 213f368d88d21514b84e677037e97e3746d6fc61 - parametized constructors in master, not sure when committed
- missing: 61a9b842a5c34a9ecc0f3aca15d476e0bffad4e7 - in master
- missing: 39492ed213757911a558b8b5e58cad3e4ce0ba40 - cherry-picked just now
- missing: 5c09968cfb3e07bbc4ca2b5baa152c5c133c7ac7 - versioning
- missing: 201a855cc5cac72870f15195d206e854f593b9de - maintenance only fix
- missing: f539d2ef0bee63a1b99e4759fa6a01c8344fd206 whitespace difference
- missing: 6c0cb8049b291e6df5d8863f48c3c2b6d3bc651e revert commit
- missing: e4ecf6ff5ea331f634c8674b5d11ef186d52550b gtk3 hack in maintenance
- missing: 95dac28be51c0eb8ab14a47447ad8ab7a239cad7 old API in maintenance
- missing: 5968aa42fac7edaaedbbbc680362a93993a1922f versioning
- missing: e7dde4151339ab12d92198131db3f0b0bbec33ce whitespace difference
- missing: e77a887a382e2c2fbaa7e75bcddf9f0da14129f6 reorganized commits
- missing: eb65cd687d0002f6e36d0280ca702cda4d9fcfb0 in master already somehow
- missing: 4f729326a186d01dc2192b752cbccc7cd5e663ca - egit hack in maintenance only