Migrate from master-slave lingo#1

bopopescu wants to merge 1 commit intoOpenAcademy-OpenStack:masterOpenAcademy-OpenStack/nova-scheduler:masterfrom

bopopescu:bucharestbopopescu/nova-scheduler-1:bucharestCopy head branch name to clipboard