Merge remote-tracking branch 'dolph/master'

Conflicts:
	keystone.json
This commit is contained in:
Russell Bryant 2013-05-29 10:53:59 -04:00
commit 79ade12faf
5 changed files with 5 additions and 5 deletions

View File

@ -1 +1 @@
{"name": "cinder", "subprojects": ["openstack/cinder", "openstack/python-cinderclient"], "core-team": ["john-griffith", "avishay-il", "zhiteng-huang", "vishvananda", "duncan-thomas", "thingee", "anotherjesse"]}
{"name": "cinder", "subprojects": ["openstack/cinder", "openstack/python-cinderclient", "openstack/volume-api"], "core-team": ["john-griffith", "avishay-il", "zhiteng-huang", "vishvananda", "duncan-thomas", "thingee", "anotherjesse"]}

View File

@ -1 +1 @@
{"name": "glance", "subprojects": ["openstack/glance", "openstack/python-glanceclient"], "core-team": ["markwash", "bcwaldon", "eglynn", "dan-prince", "flaper87", "alex-meade", "jbresnah", "iccha-sethi"]}
{"name": "glance", "subprojects": ["openstack/glance", "openstack/python-glanceclient", "openstack/image-api"], "core-team": ["markwash", "bcwaldon", "eglynn", "dan-prince", "flaper87", "alex-meade", "jbresnah", "iccha-sethi"]}

View File

@ -1 +1 @@
{"name": "keystone", "subprojects": ["openstack/keystone", "openstack/python-keystoneclient"], "core-team": ["ayoung", "blk-u", "dolph", "guang-yee", "heckj", "henry-nash", "termie"]}
{"name": "keystone", "subprojects": ["openstack/keystone", "openstack/python-keystoneclient", "openstack/identity-api"], "core-team": ["ayoung", "blk-u", "dolph", "guang-yee", "heckj", "henry-nash", "termie"]}

View File

@ -1 +1 @@
{"name": "nova", "subprojects": ["openstack/nova", "openstack/python-novaclient"], "core-team": ["jogo", "sdague", "danms", "yunmao", "p-draigbrady", "mikalstill", "russellb", "cerberus", "markmc", "dan-prince", "cbehrens", "klmitch", "johannes.erdfelt", "vishvananda", "dan-prince", "tr3buchet", "devananda", "alaski", "berrange"]}
{"name": "nova", "subprojects": ["openstack/nova", "openstack/python-novaclient", "openstack/compute-api"], "core-team": ["jogo", "sdague", "danms", "yunmao", "p-draigbrady", "mikalstill", "russellb", "cerberus", "markmc", "dan-prince", "cbehrens", "klmitch", "johannes.erdfelt", "vishvananda", "dan-prince", "tr3buchet", "devananda", "alaski", "berrange"]}

View File

@ -1 +1 @@
{"name": "quantum", "subprojects": ["openstack/quantum", "openstack/python-quantumclient"], "core-team": ["arosen", "amotoki", "danwent", "emagana", "garyk", "markmcclain", "maru", "nati-ueno", "rkukura", "salvatore-orlando", "snaiksat", "gongysh"]}
{"name": "quantum", "subprojects": ["openstack/quantum", "openstack/python-quantumclient", "openstack/netconn-api"], "core-team": ["arosen", "amotoki", "danwent", "emagana", "garyk", "markmcclain", "maru", "nati-ueno", "rkukura", "salvatore-orlando", "snaiksat", "gongysh"]}