I think this shows the commits on master that don't have cherry-picks on stable/li
[~/integration]$ git cherry -v origin/stable/lithium origin/master |grep "^+" 14:53:44
+ 3617698be9b6a68ccec6ec476f83e8acf3f00171 Incrementing versions by 0.1.0 for post-lithium master branch
+ 3fbb50ad6f771d29dc1ad859955dfe79d6dab954 Add Reservation to Integration
+ 2038520177b9a28c72a60f868fa80538e01b11e1 replacing the usage of private RequestsiLibrary to system one
+ 9070f76aadadc6336d2be54b2134376c8ec2f427 Move odl-sfcofl2 from compatible-with-all.
+ 849dadf18d29c4298e7a8ae1610ed15d5efea1b8 Bug 3827 - Chinese contributors fail to build integration test vm
+ 39b46066c84c7dfee6f6e9a6c5e5d8be8f3dfe96 test suite updated to measure the time needed for stats collection
+ 80149c003fcb84843a077466a7c01478cfbb60a2 Cleaning the ovsdb node completely for other test
+ 14c6191d72fb8e11259baf6f009833b8d2155f25 remote_host.py: re-use ssh session across commands
+ 1ca1c5405cbac944b28a438179c799b0ed42bb61 Verifying fib in operational DS instead of config DS
+ 19c160840b77da8c69ba84e052a0c6acbef29f16 Added Tests for RESTCONF on NIC
+ 4f42abbd773b020302c7dd8521db6048960ba498 Added cli directory for nic-basic JJ
+ ec17f348f7557f22a3af9101140c236b6de83ecc creating a new test suite to find out maximum number of switches connected
+ 3617698be9b6a68ccec6ec476f83e8acf3f00171 Incrementing versions by 0.1.0 for post-lithium master branch
Makes sense
+ 3fbb50ad6f771d29dc1ad859955dfe79d6dab954 Add Reservation to Integration
However, the two patches are different, which explains why git cherry didn't think there was a cherry-pick (there kinda wasn't, the diffs are different).
The version on master fixes an indentation issue with the packetcable dependency section, while the version on stable/li doesn't.
The feature.reservation.version value on master is 1.1.0, where it's 1.0.0 on stable/li
Otherwise, the diffs are the same.
TODO: Fix the indentation on stable/li as well?
+ 2038520177b9a28c72a60f868fa80538e01b11e1 replacing the usage of private RequestsiLibrary to system one
No cherry-pick to stable/li.
(done)TODO: Cherry pick this to stable/li
+ 9070f76aadadc6336d2be54b2134376c8ec2f427 Move odl-sfcofl2 from compatible-with-all.
The lines of the file changed on master and on stable/li are different, which I guess could trigger a "not the same diff" answer from git cherry. Overall, it's a proper cherry-pick with the same content and we don't need to worry about it.
+ 849dadf18d29c4298e7a8ae1610ed15d5efea1b8 Bug 3827 - Chinese contributors fail to build integration test vm
https://git.opendaylight.org/gerrit/#/c/23038/
This was merged during one of the no-merged-to-Li phases, so it intentionally wasn't cherry-picked.
(done)TODO: Cherry pick to stable/li
+ 39b46066c84c7dfee6f6e9a6c5e5d8be8f3dfe96 test suite updated to measure the time needed for stats collection
https://git.opendaylight.org/gerrit/#/c/23166/
Same as above, merged to master when we couldn't merge to stable/li, so intentionally not cherry-picked.
(done)TODO: Cherry pick to stable/li
+ 80149c003fcb84843a077466a7c01478cfbb60a2 Cleaning the ovsdb node completely for other test
https://git.opendaylight.org/gerrit/#/c/23185/
Not cherry-picked
(done)TODO: Cherry pick to stable/li
+ 14c6191d72fb8e11259baf6f009833b8d2155f25 remote_host.py: re-use ssh session across commands
https://git.opendaylight.org/gerrit/#/c/23246/2
Cherry-picked, but cherry-pick not merged as it was a no-merges-to-Li period.
(done)TODO: Cherry pick to stable/li
+ 1ca1c5405cbac944b28a438179c799b0ed42bb61 Verifying fib in operational DS instead of config DS
https://git.opendaylight.org/gerrit/#/c/23249/
Not cherry-picked
TODO: Cherry pick to stable/li * Tried, seeing an error about missing the signed-off-by part
+ 19c160840b77da8c69ba84e052a0c6acbef29f16 Added Tests for RESTCONF on NIC
https://git.opendaylight.org/gerrit/#/c/23391/
Not cherry-picked
(done)TODO: Cherry pick to stable/li
+ 4f42abbd773b020302c7dd8521db6048960ba498 Added cli directory for nic-basic JJ
https://git.opendaylight.org/gerrit/#/c/23443/
Cherry pick was failing verification for what seems to have been an ephemeral reason.
I reverified it and it passed.
(done)TODO: Cherry pick to stable/li
+ ec17f348f7557f22a3af9101140c236b6de83ecc creating a new test suite to find out maximum number of switches connected
https://git.opendaylight.org/gerrit/#/c/23017/
Not cherry-picked
(done)TODO: Cherry pick to stable/li
I handled every issue I could. Remaining changes:
[~/integration]$ git cherry -v origin/stable/lithium origin/master |grep "^+" 19:13:42
+ 3617698be9b6a68ccec6ec476f83e8acf3f00171 Incrementing versions by 0.1.0 for post-lithium master branch
+ 3fbb50ad6f771d29dc1ad859955dfe79d6dab954 Add Reservation to Integration
+ 9070f76aadadc6336d2be54b2134376c8ec2f427 Move odl-sfcofl2 from compatible-with-all.
+ 1ca1c5405cbac944b28a438179c799b0ed42bb61 Verifying fib in operational DS instead of config DS
+ 3617698be9b6a68ccec6ec476f83e8acf3f00171 Incrementing versions by 0.1.0 for post-lithium master branch
This is expected.
+ 3fbb50ad6f771d29dc1ad859955dfe79d6dab954 Add Reservation to Integration
However, the two patches are different, which explains why git cherry didn't think there was a cherry-pick (there kinda wasn't, the diffs are different).
The version on master fixes an indentation issue with the packetcable dependency section, while the version on stable/li doesn't.
The feature.reservation.version value on master is 1.1.0, where it's 1.0.0 on stable/li
Otherwise, the diffs are the same.
TODO: Fix the indentation on stable/li as well? Leave alone, nbd?
+ 9070f76aadadc6336d2be54b2134376c8ec2f427 Move odl-sfcofl2 from compatible-with-all.
The lines of the file changed on master and on stable/li are different, which I guess could trigger a "not the same diff" answer from git cherry. Overall, it's a proper cherry-pick with the same content and we don't need to worry about it.
+ 1ca1c5405cbac944b28a438179c799b0ed42bb61 Verifying fib in operational DS instead of config DS
https://git.opendaylight.org/gerrit/#/c/23249/
I tried to cherry-pick this, but I'm getting an error:
not Signed-off-by author/committer/uploader in commit message footer
Not sure what's going wrong. I asked zxiiro but haven't heard back.
TODO: Fix the signed-off-by error and cherry-pick to stable/li