My version of nova in devstack:
stack@archive:/opt/stack/nova$ git log -1 commit f6a5a43e06c2af6325d7a3552c71e968565684fc Merge: f268cf5 0df6fba Author: Jenkins <email address hidden> Date: Mon Nov 16 18:01:40 2015 +0000
Merge "Remove duplicate server.kill on test shutdown"
My version of nova in devstack:
stack@archive: /opt/stack/ nova$ git log -1 325d7a3552c71e9 68565684fc
commit f6a5a43e06c2af6
Merge: f268cf5 0df6fba
Author: Jenkins <email address hidden>
Date: Mon Nov 16 18:01:40 2015 +0000
Merge "Remove duplicate server.kill on test shutdown"