Merge branch 'master' into openstack-os-build
Merge branch 'master' into openstack-os-build
Merge remote-tracking branch 'origin/openstack-os-build' into openstack-os-build
Merge remote-tracking branch 'origin/openstack-os-build' into openstack-os-build
Merge remote-tracking branch 'origin/openstack-os-build' into openstack-os-build
Merge branch 'master' into openstack-os-build
Merge remote-tracking branch 'origin/openstack-os-build' into openstack-os-build
Merge remote-tracking branch 'origin/openstack-os-build' into openstack-os-build
Merge branch 'master' into openstack-os-build
Add updated submodule references for openstack-os-build
Add updated submodule references for master
Merge branch 'master' into openstack-os-build
 attempt to resolve bc/crowbar submod conflict
Merge remote-tracking branch 'origin/master'
 attempt to resolve bc/crowbar submod conflict
Merge remote-tracking branch 'origin/openstack-os-build' into openstack-os-build
Merge branch 'master' into openstack-os-build
Merge pull request #1074 from aabes/pull-req-master-06fbb4d59f

update openstack DG [3/6]
Merge pull request #1076 from aabes/pull-req-openstack-os-build-b2cc605a3e

update openstack DG [5/6]
Merge branch 'master' into openstack-os-build