Merge branch 'master' into openstack-os-build
Merge remote-tracking branch 'origin/openstack-os-build' into openstack-os-build
Merge branch 'master' into openstack-os-build
Merge branch 'master' into openstack-os-build
Eschew barclamp merge conflicts.
Eschew barclamp merge conflicts.
Move barclamp submodule refs back.
Move barclamp submodule refs back.
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/master'
Merge remote-tracking branch 'origin/openstack-os-build' into openstack-os-build
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into openstack-os-build
Sync all trees
Merge branch 'release/rails3anddb/master' into release/rails3anddb/openstack-os-build
Sync all builds
Add some initial rails3 pieces and move assets
Merge branch 'release/rails3anddb/master' into release/rails3anddb/openstack-os-build