Remove incorrect bwc branch logic from master

Commit bf007e8d93 was a forward port of logic needed in 5.x to get
the correct bwc branch. However, other changes on master meant that this forward port was not
needed and actually broke the bwc tests. This change removes the incorrect if statement.

Relates #25134
This commit is contained in:
jaymode 2017-06-09 09:27:53 -06:00
parent 64888f6f01
commit 5997e4a39d
No known key found for this signature in database
GPG Key ID: D859847567B3493D
1 changed files with 0 additions and 2 deletions

View File

@ -55,8 +55,6 @@ if (enabled) {
String bwcBranch String bwcBranch
if (project.name == 'bwc-stable-snapshot') { if (project.name == 'bwc-stable-snapshot') {
bwcBranch = "${major}.x" bwcBranch = "${major}.x"
} else if (major != currentMajor) {
bwcBranch = "${major}.x"
} else { } else {
bwcBranch = "${major}.${minor}" bwcBranch = "${major}.${minor}"
} }