tree 8c25399d9816daadb49c0d25ad76085a74fae9e3
parent f32949c100f24ac22b2535ac34ee013f0898b3a4
parent 1fc03da13ba39fa9a04dfca7837e44f3fa67b4e6
author Pingping Lin <pingping@onlab.us> 1465498480 +0000
committer Pingping Lin <pingping@onlab.us> 1465498480 +0000

Merge branch 'open-cloud-master'