Commit 1d1de8be authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

rebaseline conflict fix

parent af158134
Loading
Loading
Loading
Loading
+2 −8
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ AdvantEDGE is a Mobile Edge Emulation Platform (MEEP) that runs on Docker & Kube

## Concepts

An understanding of some AdvantEDGE concepts is helpful towards effectively using the platform and understanding how it works.

Before getting started we recommend familiarity with key [AdvantEDGE concepts](docs/concepts.md)

## Getting started
@@ -56,14 +58,6 @@ Before getting started we recommend familiarity with key [AdvantEDGE concepts](d

The AdvantEDGE platform test procedures are described [here](docs/testing.md)

## Concepts
An understanding of some AdvantEDGE concepts is helpful towards effectively using the platform and understanding how it works.  These core AdvantEDGE concepts are described [here](docs/concepts.md)
- [x] Micro-service Architecture
- [x] Macro-network Model
- [x] Network characteristics
- [x] Mobility
- [x] External UE support

## Upstream communication

We use GitHub issues.