summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'testing' into beSander Vrijders2017-03-212-3/+9
|\
| * Merged in sandervrijders/ouroboros/testing-local (pull request #408)Sander Vrijders2017-03-212-4/+10
| |\
| | * ipcpd: local: Handle failed flow allocationSander Vrijders2017-03-212-4/+10
| |/
* | Merged in sandervrijders/ouroboros/be-fmgr (pull request #406)Sander Vrijders2017-03-215-52/+78
|\ \
| * | ipcpd: normal: Split fmgr init into init and startSander Vrijders2017-03-215-52/+78
* | | Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into beSander Vrijders2017-03-21190-2409/+3048
|\ \ \
| * \ \ Merged in dstaesse/ouroboros/be-lib-flowset (pull request #405)dimitri staessens2017-03-213-0/+28
| |\ \ \
| | * | | lib: Add queued SDUs when adding fd to flow_setdimitri staessens2017-03-213-0/+28
| * | | | Merged in dstaesse/ouroboros/be-complete (pull request #404)dimitri staessens2017-03-211-0/+3
| |\| | | | | |/ / | |/| |
| | * | ipcpd: Fill qosspec in complete gam policydimitri staessens2017-03-211-0/+3
| |/ /
| * | Merged in dstaesse/ouroboros/be-connmgr (pull request #403)dimitri staessens2017-03-203-31/+39
| |\ \
| | * | ipcpd: Create CDAP instance before connectingdimitri staessens2017-03-201-11/+12
| | * | ipcpd: Fix cleanup of connmgrdimitri staessens2017-03-202-20/+27
| * | | Merged in sandervrijders/ouroboros/be-graph (pull request #402)Sander Vrijders2017-03-206-64/+539
| |\ \ \
| | * | | ipcpd: normal: routing: Listen to RIB eventsSander Vrijders2017-03-203-34/+182
| | * | | ipcpd: normal: Add graph structureSander Vrijders2017-03-145-38/+365
| * | | | Merged in dstaesse/ouroboros/be-fixes (pull request #401)dimitri staessens2017-03-153-26/+57
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | ipcpd: Fix disregarding qs in connmgrdimitri staessens2017-03-141-2/+5
| | * | lib: Fix CDAP with multiple fdsdimitri staessens2017-03-142-24/+52
| |/ /
| * | Merged in sandervrijders/ouroboros/be-rib-routing (pull request #400)Sander Vrijders2017-03-133-48/+132
| |\ \
| | * | ipcpd: normal: Add Flow State Objects to RIBSander Vrijders2017-03-133-48/+132
| |/ /
| * | Merged in dstaesse/ouroboros/be-cdap (pull request #399)dimitri staessens2017-03-031-2/+2
| |\ \
| | * | lib: Fix typo in cdapdimitri staessens2017-03-031-2/+2
| |/ /
| * | Merged in dstaesse/ouroboros/be-cdap (pull request #398)dimitri staessens2017-03-036-139/+287
| |\ \
| | * | lib: Manage multiple flows with a single CDAP instancedimitri staessens2017-03-036-139/+287
| |/ /
| * | Merged in sandervrijders/ouroboros/be-cdap-flow (pull request #397)Sander Vrijders2017-03-03171-640/+542
| |\ \
| | * | Change email addresses to ugent.beSander Vrijders2017-03-03147-238/+374
| | * | build: Format CMakeLists.txt filesSander Vrijders2017-03-0321-169/+167
| | * | lib: Install cacep.h on installSander Vrijders2017-03-031-0/+1
| | * | ipcpd: normal: Deprecate CDAP flowSander Vrijders2017-03-033-233/+0
| |/ /
| * | Merged in sandervrijders/ouroboros/be-ae-conn (pull request #396)Sander Vrijders2017-03-0324-725/+1065
| |\ \
| | * | ipcpd: normal: Refactor application entities and add neighbors structSander Vrijders2017-03-0324-725/+1065
| |/ /
| * | Merged in sandervrijders/ouroboros/be-aes (pull request #395)Sander Vrijders2017-03-0213-91/+452
| |\ \
| | * | ipcpd: normal: Add connection managerSander Vrijders2017-03-0213-91/+452
| |/ /
| * | Merged in dstaesse/ouroboros/be-cacep (pull request #394)dimitri staessens2017-02-284-39/+94
| |\ \
| | * | lib: Split CACEP into request/response protocoldimitri staessens2017-02-284-39/+94
| * | | Merged in dstaesse/ouroboros/be-cacep (pull request #393)dimitri staessens2017-02-2721-864/+186
| |\| |
| | * | lib: Split authentication from CACEPdimitri staessens2017-02-2721-864/+186
| |/ /
| * | Merged in sandervrijders/ouroboros/be-ae (pull request #392)Sander Vrijders2017-02-2436-199/+61
| |\ \
| | * | lib: Remove application entity nameSander Vrijders2017-02-2436-199/+61
| |/ /
| * | Merged in dstaesse/ouroboros/be-cacep (pull request #391)dimitri staessens2017-02-2415-154/+174
| |\ \
| | * | Revise CACEP APIdimitri staessens2017-02-2415-154/+174
* | | | Merge branch 'testing' into beSander Vrijders2017-03-215-14/+29
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merged in dstaesse/ouroboros/testing-waits (pull request #407)dimitri staessens2017-03-215-14/+29
| |\ \
| | * | irmd: Fix timeouts in reg_entrydimitri staessens2017-03-215-14/+29
| |/ /
* | / Merge branch 'testing' into beSander Vrijders2017-02-241-1/+1
|\| | | |/ |/|
| * Merged in dstaesse/ouroboros/testing-irmd (pull request #390)dimitri staessens2017-02-241-1/+1
| |\
| | * irmd: Fix bug in name comparison of IPCPsdimitri staessens2017-02-241-1/+1
| |/
* | Merge branch 'testing' into beSander Vrijders2017-02-232-7/+34
|\|
| * Merged in dstaesse/ouroboros/testing-bootstrap (pull request #389)dimitri staessens2017-02-232-7/+34
| |\