Changes between Version 35 and Version 36 of SpiralTwo

Timestamp:

10/27/09 10:45:16 (15 years ago)

Author:

Aaron Falk

Comment:

--

SpiralTwo

@@ -40 +40 @@
   ||                                                            ||   '''!PlanetLab Cluster (B)'''|| '''ProtoGENI Cluster (C)'''||  '''ORCA Cluster (D)'''  ||  '''ORBIT Cluster (E)''' || '''Cluster TBD''' || 
   || ''Cluster Integration Info''            || [wiki:ClusterB Cluster wiki] ||  [wiki:ClusterC  Cluster wiki]||  [wiki:ClusterD Cluster wiki]||  [wiki:ClusterE Cluster wiki] || ||
-  ||  ''Control Framework [[BR]] Design and Prototyping''   ||   PlanetLab   ||  [wiki:ProtoGENI]  [[BR]]  DigitalObjectRegistry [[BR]] [wiki:PGAugmentation] || [wiki:ORCABEN ORCA/BEN] [[BR]][wiki:ORCAAUG  ORCA Augmentation] ||  [wiki:ORBIT] || ||
+  ||  ''Control Framework [[BR]] Design and Prototyping''   ||   PlanetLab   ||   [[BR]]  DigitalObjectRegistry [[BR]] [wiki:PGAugmentation] || [wiki:ORCABEN ORCA/BEN] [[BR]][wiki:ORCAAUG  ORCA Augmentation] ||  [wiki:ORBIT] || ||
   || ''Network Aggregate [[BR]] Design and Prototyping''    ||    [wiki:"Mid-Atlantic Crossroads"] [[BR]]  [wiki:GpENI] ||  [wiki:DTunnels] [[BR]]  [wiki:CRON] [[BR]] [wiki:PrimoGENI] || [wiki:ORCABEN ORCA/BEN] [[BR]] [wiki:IGENI  iGENI][[BR]][wiki:LEARN  LEARN] ||  ||  ||
   || ''Programmable Network Node[[BR]] Design and Prototyping''  ||    EnterpriseGeni [[BR]] [wiki:"Internet Scale Overlay Hosting"] || [wiki:CmuLab CMULab] [[BR]] ProgrammableEdgeNode ||  ||  || ||
@@ -54 +54 @@
   || ''!OpenFlow Meso-Scale Deployment''  || EnterpriseGeni  ||
   || ''!WiMax Meso-Scale Deployments'' ||     [wiki:WiMAX]||
+  || ''ProtoGENI Backbone Nodes'' || [wiki:ProtoGENI]  ||
   || ''Meso-scale Measurement'' ||  ||
   || ''Operations'' ||    [wiki:GENIMetaOps]     ||
@@ -61 +62 @@
 ===  Studies ===
 
-  || ''Outreach'' ||  [wiki:GeniFourYearColleges]| [wiki:AttributionForGENI]  | [wiki:MMOGpENI]||
+   [wiki:GeniFourYearColleges]| [wiki:AttributionForGENI]  | [wiki:MMOGpENI]
 
 === Completed Projects ===