Changes between Version 33 and Version 34 of SpiralTwo

Timestamp:

10/27/09 10:41:21 (15 years ago)

Author:

Aaron Falk

Comment:

--

SpiralTwo

@@ -44 +44 @@
   || ''Programmable Network Node[[BR]] Design and Prototyping''  ||    EnterpriseGeni [[BR]] [wiki:"Internet Scale Overlay Hosting"] || [wiki:CmuLab CMULab] [[BR]] ProgrammableEdgeNode ||  ||  || ||
   || ''Compute Aggregate [[BR]] Design and Prototyping'' || [wiki:OpenCIRRUS] ||  [wiki:MillionNodeGENI]  || [wiki:DICLOUD  Data Intensive Cloud Control] || || || 
-  || ''Wireless Aggregate [[BR]] Design and Prototyping''    ||  || [wiki:CmuLab CMULab] || [wiki:DOME] [[BR]] [wiki:ViSE] [[BR]] [wiki:KanseiSensorNet] [[BR]] [wiki:OKGEMS  OKGems: Cyber-Physical System][[BR]]
+  || ''Wireless Aggregate [[BR]] Design and Prototyping''    ||  || [wiki:CmuLab CMULab] || [wiki:DOME] [[BR]] [wiki:ViSE] [[BR]] [wiki:KanseiSensorNet] [[BR]] [wiki:OKGEMS  OKGems: Cyber-Physical System]
 ||  [wiki:ORBIT] [[BR]] [wiki:WiMAX] ||  ||
   || ''Instrumentation & Measurement [[BR]] Design and Prototyping''  || [wiki:VMI]   || InstrumentationTools [[BR]] MeasurementSystem [[BR]]  [wiki:OnTimeMeasure] [[BR]] [wiki:LAMP] [[BR]] [wiki:ScalableMonitoring] ||  [wiki:"Embedded Real-Time Measurements" Embedded Real-Time Measurements] [[BR]] [wiki:IMF  Integrated Measurement Framework] ||  ||   ||
@@ -58 +58 @@
   || ''Operations'' ||    [wiki:GENIMetaOps]     ||
   || ''Security'' ||   [wiki:GENISecurity] | [wiki:ComprehensiveSecurityPgm] ||
-  || ''Federation''  ||    [wiki:K-GENI] | [wiki:MMOGpENI]  | [wiki:VMI]  | [wiki:PLfed] | [wiki:TIED] || 
+  || ''Federation''  ||    [wiki:K-GENI]   | [wiki:VMI]  | [wiki:PLfed] | [wiki:TIED] || 
  
 ===  Studies ===
 
-  || ''Outreach'' ||  [wiki:GeniFourYearColleges]| [wiki:AttributionForGENI]  ||
+  || ''Outreach'' ||  [wiki:GeniFourYearColleges]| [wiki:AttributionForGENI]  | [wiki:MMOGpENI]||
 
 === Completed Projects ===