openairinterface5G merge requestshttps://gitlab.eurecom.fr/oai/openairinterface5g/-/merge_requests2019-06-26T01:33:32Zhttps://gitlab.eurecom.fr/oai/openairinterface5g/-/merge_requests/621dummy2019-06-26T01:33:32ZRaphael DefosseuxdummySigned-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>https://gitlab.eurecom.fr/oai/openairinterface5g/-/merge_requests/563Removing the creation of lte_build_oai (copy of ran_build).2019-05-03T14:02:07ZBoris DjalalRemoving the creation of lte_build_oai (copy of ran_build).Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>Raphael DefosseuxRaphael Defosseuxhttps://gitlab.eurecom.fr/oai/openairinterface5g/-/merge_requests/507Develop integration 2019 week 072019-02-17T20:53:32ZRaphael DefosseuxDevelop integration 2019 week 07**Integration Branch: 2019 week 07**
Integration of the following Merge Requests:
- [MR 472](https://gitlab.eurecom.fr/oai/openairinterface5g/merge_requests/472): Resolve "ULSCH scheduler optimization
- [MR 489](https://gitlab.eurecom....**Integration Branch: 2019 week 07**
Integration of the following Merge Requests:
- [MR 472](https://gitlab.eurecom.fr/oai/openairinterface5g/merge_requests/472): Resolve "ULSCH scheduler optimization
- [MR 489](https://gitlab.eurecom.fr/oai/openairinterface5g/merge_requests/489): X2AP: mobility procedures, S1AP: handover signalling, RRC/MAC: handover case, GTP-U: end marker
- [MR 493](https://gitlab.eurecom.fr/oai/openairinterface5g/merge_requests/493): cppcheck fixes
- [MR 501](https://gitlab.eurecom.fr/oai/openairinterface5g/merge_requests/501): Issue397 telnet stats
- [MR 503](https://gitlab.eurecom.fr/oai/openairinterface5g/merge_requests/502): rhel7.6 support
- [MR 506](https://gitlab.eurecom.fr/oai/openairinterface5g/merge_requests/506): Hot fix on UE configuration moduleRaphael DefosseuxRaphael Defosseuxhttps://gitlab.eurecom.fr/oai/openairinterface5g/-/merge_requests/441CI: testing MR from non-develop branches on the slave job2018-11-09T10:58:10ZRaphael DefosseuxCI: testing MR from non-develop branches on the slave jobThe master job pipeline should provide to the slave jobs the target branch of the merge requestThe master job pipeline should provide to the slave jobs the target branch of the merge requestRaphael DefosseuxRaphael Defosseuxhttps://gitlab.eurecom.fr/oai/openairinterface5g/-/merge_requests/401Astyle integration test42018-09-28T08:37:50ZRaphael DefosseuxAstyle integration test4This is a test on how to astyle and merge to validate the process.
I've integrated 4 pending MRs:
- First I've astyled in each branch with the CI astyle option files the files that are been modified by the MR
- Then I merge into the i...This is a test on how to astyle and merge to validate the process.
I've integrated 4 pending MRs:
- First I've astyled in each branch with the CI astyle option files the files that are been modified by the MR
- Then I merge into the integration using `git merge -s recursive -Xpatience src_branch` command
There were merge conflicts but they were quite trivial
CI will run after each branch mergeRaphael DefosseuxRaphael Defosseuxhttps://gitlab.eurecom.fr/oai/openairinterface5g/-/merge_requests/399Astyle integration test22018-09-27T07:20:00ZRaphael DefosseuxAstyle integration test2This is a test on how to astyle and merge to validate the process.
I've integrated 4 pending MRs:
* First I've astyled in each branch with the CI astyle option files the files that are been modified by the MR
* Then I merge into the in...This is a test on how to astyle and merge to validate the process.
I've integrated 4 pending MRs:
* First I've astyled in each branch with the CI astyle option files the files that are been modified by the MR
* Then I merge into the integration using `git merge -s recursive -Xpatience src_branch` command
There were merge conflicts but they were quite trivialRaphael DefosseuxRaphael Defosseuxhttps://gitlab.eurecom.fr/oai/openairinterface5g/-/merge_requests/400Astyle integration test32018-09-27T07:19:51ZRaphael DefosseuxAstyle integration test3This is a test on how to astyle and merge to validate the process.
I've integrated 4 pending MRs:
- First I've astyled in each branch with the CI astyle option files the files that are been modified by the MR
- Then I merge into the i...This is a test on how to astyle and merge to validate the process.
I've integrated 4 pending MRs:
- First I've astyled in each branch with the CI astyle option files the files that are been modified by the MR
- Then I merge into the integration using `git merge -s recursive -Xdiff-algorithm=histogram src_branch` command
There were merge conflicts but they were quite trivial.
Compared to MR 399, I made one different choice on a mergeRaphael DefosseuxRaphael Defosseuxhttps://gitlab.eurecom.fr/oai/openairinterface5g/-/merge_requests/398Astyle integration test2018-09-26T10:21:20ZRaphael DefosseuxAstyle integration testThis is a test on how to astyle and merge to validate the process.
I've integrated 4 pending MRs:
* First I've astyled in each branch with the CI astyle option files the files that are been modified by the MR
* Then I merge into the in...This is a test on how to astyle and merge to validate the process.
I've integrated 4 pending MRs:
* First I've astyled in each branch with the CI astyle option files the files that are been modified by the MR
* Then I merge into the integration using `git merge -s recursive -Xtheirs src_branch` command
There was no merge conflictsRaphael DefosseuxRaphael Defosseux