projects / osm / SO.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 03a8396 e42ec8f)
Merge branch 'master' into tosca 15/1315/1 tosca
authorHashir Mohammed <hashir.mohammed@riftio.com>
Thu, 16 Mar 2017 06:44:50 +0000 (02:44 -0400)
committerHashir Mohammed <hashir.mohammed@riftio.com>
Thu, 16 Mar 2017 07:26:17 +0000 (03:26 -0400)
Signed-off-by: Hashir Mohammed <hashir.mohammed@riftio.com>
1  2 
common/python/CMakeLists.txt patch | diff1 | diff2 | blob | history
models/plugins/yang/mano-types.yang patch | diff1 | diff2 | blob | history

diff --cc common/python/CMakeLists.txt
Simple merge
diff --cc models/plugins/yang/mano-types.yang
Simple merge