Changes between Version 70 and Version 71 of SpiralFour

Timestamp:

03/21/12 21:15:55 (12 years ago)

Author:

Vic Thomas

Comment:

--

SpiralFour

@@ -43 +43 @@
 == 6. GENI Aggregates ==
   || ''Network Aggregates'' ||  [wiki:GpENI] |  [wiki:BGPMux] |  [wiki:CRON]  |  ''[wiki:ORCABEN ORCA/BEN]'' |  [wiki:IGENI  iGENI] | [wiki:LEARN  LEARN]  | ''[wiki:"Mid-Atlantic Crossroads" MAX Aggregate]'' ||
-  || ''Compute Aggregates'' ||  ''PlanetLab'' |  ''[wiki:ProtoGENI]'' | [wiki:PrimoGENI] ||
+  || ''Compute Aggregates'' || [wiki:PrimoGENI] | ''PlanetLab'' | ''[wiki:ProtoGENI]'' ||
   || ''Cloud Aggregates'' || [wiki:GENICloud GENICloud] |  [wiki:DICLOUD  Data Intensive Cloud Control]  ||
   || ''Integration'' || [wiki:PLfed PlanetLab Federation] | [http://groups.geni.net/geni/wiki/ClusterD  ORCA Cluster Roadmap and Integration] | [wiki:OKGEMS  OKGems] | ''[wiki:CmuLab CMULab]'' ||
@@ -75 +75 @@
 == 10. Experimentation with GENI ==
   || ''Experiments'' ||  [wiki:DavisSocialLinks(DSL)] |  ''[wiki:OpportunisticWirelessNets Opportunistic Wireless Networks]'' ||
-  || ''EAGER'' Experiments || [wiki:FirstGenEagerExperiments First Generation EAGER Grants] |  [wiki:EagerExperiments2011 Fall 2011 EAGER Grants] ||
+  || ''EAGER Experiments'' || [wiki:FirstGenEagerExperiments First Generation EAGER Grants] |  [wiki:EagerExperiments2011 Fall 2011 EAGER Grants] ||
 [[BR]]
 
@@ -89 +89 @@
 
 == 13. GENI Study Projects ==
-  || [wiki:AttributionForGENI Attribution for GENI] ||
-  || ''[wiki:GeniFourYearColleges]''  | ''[wiki:InfoSubstrate Information Substrate for GENI]'' | ''OpticalAccessNets'' |  ''[wiki:"Data Plane Measurements"]''  ||
+  || [wiki:AttributionForGENI Attribution for GENI] | '[wiki:GeniFourYearColleges]''  | ''[wiki:InfoSubstrate Information Substrate for GENI]'' | ''OpticalAccessNets'' |  ''[wiki:"Data Plane Measurements"]''  ||
 [[BR]]