"The 'dev' branch and the 'master' branch are supposed to be in sync where we push to 'dev' and merge to 'master'.
However, for some reason, this is not the case and 'master' and 'dev' have diverged in a few places from many years ago. I found this by accident while fixing a merge commit in the Github UI which applied all 'dev' changes to 'master'. I reverted this merge commit, but as part of reverting it, it also removed code from 'master' which was previously removed in 'dev'.
Eg: CassCommonConfig:getTokenRefreshInterval()
This removed code is actually used by other services that rely on dynomite-manager and the above broke them. The fix is to "revert the revert commit" which brings master back to its original state and also applies the latest fixes we want on it.
The reason this never happened every other time we merged 'dev' into 'master' was because we'd only merge the patches we wanted to, and those never touched upon these diverged classes."
This reverts commit 3730401bef7acfc86aaf98df2f104ce289a90827.
Same as we did for 'dev'.
"The 'dev' branch and the 'master' branch are supposed to be in sync where we push to 'dev' and merge to 'master'. However, for some reason, this is not the case and 'master' and 'dev' have diverged in a few places from many years ago. I found this by accident while fixing a merge commit in the Github UI which applied all 'dev' changes to 'master'. I reverted this merge commit, but as part of reverting it, it also removed code from 'master' which was previously removed in 'dev'.
Eg: CassCommonConfig:getTokenRefreshInterval() This removed code is actually used by other services that rely on dynomite-manager and the above broke them. The fix is to "revert the revert commit" which brings master back to its original state and also applies the latest fixes we want on it. The reason this never happened every other time we merged 'dev' into 'master' was because we'd only merge the patches we wanted to, and those never touched upon these diverged classes."
This reverts commit 3730401bef7acfc86aaf98df2f104ce289a90827.