| commit | 0e42139641730146b0153f4b4d2948a661f04b28 | [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 | 029fd7d7113427fcfc5e7ecb387d7f3834cbdd53 | |
| parent | 37e4efee7e8d597717c84951026ed09e9dbe4c6e [diff] | |
| parent | 80beeb4d26bc1a643feca35f20321f6c6e78d861 [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: