| commit | 2427117d48c834c452d10b4e15e3280d3689131d | [log] [tgz] |
|---|---|---|
| author | Jeremy Mowery <jermowery@email.arizona.edu> | Mon Mar 14 09:46:51 2016 -0700 |
| committer | Jeremy Mowery <jermowery@email.arizona.edu> | Mon Mar 14 09:46:51 2016 -0700 |
| tree | a5f6e7b998eeee6af3c99ea8d5c625e0b9e7a764 | |
| parent | 47c9374a62e7d666a9beddddfaf15b57645e3b15 [diff] | |
| parent | 71cc84cd3340502b04f2aa174a402914cc0adf3b [diff] |
Fix merge conflict
For a general introduction to XOS and how it is used in CORD, see http://guide.xosproject.org. The "Developer Guide" at that URL is especially helpful, although it isn't perfectly sync'ed with master. Additional design notes, presentations, and other collateral are also available at http://xosproject.org and http://cord.onosproject.org.
The best way to get started is to look at the collection of canned configurations in xos/configurations/. The cord configuration in that directory corresponds to our current CORD development environment, and the README.md you'll find there will help you get started.
Source tree layout: