projects / osm / SO.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c4e133 98078c9)
Merge from SO/master to SO/projects 80/1580/1
authorPhilip Joseph <philip.joseph@riftio.com>
Tue, 18 Apr 2017 14:12:02 +0000 (14:12 +0000)
committerPhilip Joseph <philip.joseph@riftio.com>
Tue, 18 Apr 2017 14:12:02 +0000 (14:12 +0000)
Change-Id: I89cba164c73b35407481e4805fe29de30b4ddf2f
Signed-off-by: Philip Joseph <philip.joseph@riftio.com>
1  2 
models/plugins/yang/mano-types.yang patch | diff1 | diff2 | blob | history
models/plugins/yang/nsd.yang patch | diff1 | diff2 | blob | history

diff --cc models/plugins/yang/mano-types.yang
Simple merge
diff --cc models/plugins/yang/nsd.yang
Simple merge