Changes between Version 22 and Version 23 of SpiralTwo

Timestamp:

10/26/09 12:05:39 (15 years ago)

Author:

Aaron Falk

Comment:

--

SpiralTwo

@@ -55 +55 @@
 
 === Meso-Scale Deployment Projects ===
-  ||                                          || '''!OpenFlow Meso-Scale Deployment''' || '''!WiMax Meso-Scale Deployments''' || 
-  || ''Substrate Prototyping''  || EnterpriseGeni  ||  [wiki:WiMAX] ||
-  || ''Deployments ''                ||  ||  ||  
 
-=== Cross-Cluster Projects ===
- || ''Security studies '' ||   [wiki:GENISecurity] | [wiki:ComprehensiveSecurityPgm] | [wiki:AttributionForGENI] ||
- || ''Federation studies ''  ||    [wiki:K-GENI] | [wiki:MMOGpENI]  | [wiki:VMI]  | [wiki:PLfed]|| 
- || ''Other'' ||    [wiki:GENIMetaOps] | [wiki:GeniFourYearColleges]  |   [wiki:TIED] | [wiki:"Data Plane Measurements"] ||
+  || ''!OpenFlow Meso-Scale Deployment''  || EnterpriseGeni  ||
+  || ''!WiMax Meso-Scale Deployments'' ||     [wiki:WiMAX]||
+  || ''Security studies '' ||   [wiki:GENISecurity] | [wiki:ComprehensiveSecurityPgm] | [wiki:AttributionForGENI] ||
+  || ''Federation studies ''  ||    [wiki:K-GENI] | [wiki:MMOGpENI]  | [wiki:VMI]  | [wiki:PLfed] | [wiki:TIED] || 
+  || ''Operations'' ||    [wiki:GENIMetaOps]     ||
+  || ''Outreach'' ||  [wiki:GeniFourYearColleges] ||
 
 
 === Completed Projects ===
-  || OpticalAccessNets ||RegionalOptIn || 
+  || OpticalAccessNets | RegionalOptIn | [wiki:"Data Plane Measurements"]||