update adapter

Change-Id: I36344dda1a4bfe7df1b0f3bf4622c6323a522583
Merge branch 'dev' of https://github.com/davidyuan1989/nova into dev
update adapter

Change-Id: I3d7118f20183916c531a4341299b455697b130d7
Merge branch 'dev' of https://github.com/davidyuan1989/nova into dev