tree f70a2caa86b4a2ca9b846b16fb68415e34746883
parent 3ef821a025ee7025f061a9d01a07b0cf2cbd1de8
parent 8be8384ef55d1e109c2f5d61c41f1f4953377ff2
author David K. Bainbridge <dbainbri@ciena.com> 1509652655 -0700
committer David K. Bainbridge <dbainbri@ciena.com> 1509652870 -0700

Merge master into voltha-1.1 and correct version information

Merge commit '8be8384ef55d1e109c2f5d61c41f1f4953377ff2' into HEAD

Change-Id: I77b1db562fd3508c0e9c7b9042af0d9ee8801f69