Changes between Version 43 and Version 44 of SpiralFour

Timestamp:

01/16/12 13:49:01 (12 years ago)

Author:

hmussman@bbn.com

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]  ||
+  || ''Integration'' ||  [http://groups.geni.net/geni/wiki/ClusterD  ORCA Cluster] | [wiki:OKGEMS  OKGems] ||
+  || ''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'' || [wiki:PrimoGENI] ||
   || ''Cloud Aggregates'' || [wiki:GENICloud GENICloud] |  [wiki:DICLOUD  Data Intensive Cloud Control]  ||
-  || ''Completed Projects'' || PlanetLab |  [wiki:ProtoGENI] | [wiki:ORBIT] | [wiki:"Mid-Atlantic Crossroads" MAX Aggregate] |  [wiki:CmuLab CMULab] |  [wiki:DOME]  |  [wiki:ViSE]  | [wiki:KanseiSensorNet] | [wiki:OKGEMS  OKGems] |  [wiki:COGRADIO Cognitive Radio] ||
+  || ''Wireless Aggregates'' ||  '''[wiki:DOME]'''  |  '''[wiki:ORBIT]''' |  '''[wiki:MPRADIO  Cognitive Radio Study]'''  | [wiki:COGRADIO Cognitive Radio] ||
+  || ''Sensor Aggregates''  ||  '''[wiki:ViSE]'''  |  '''[wiki:KanseiSensorNet]''' ||
+  || ''Completed Projects'' || PlanetLab |  [wiki:ProtoGENI] |  [wiki:CmuLab CMULab] ||
 [[BR]]
 
@@ -88 +91 @@
 == 13. GENI Study Projects ==
   || ''Studies'' || [wiki:AttributionForGENI Attribution for GENI] ||
-  || ''Completed Projects'' ||  [wiki:GeniFourYearColleges] |  [wiki:MPRADIO] | [wiki:InfoSubstrate Information Substrate for GENI] | OpticalAccessNets |  [wiki:"Data Plane Measurements"]  ||
+  || ''Completed Projects'' ||  [wiki:GeniFourYearColleges]  | [wiki:InfoSubstrate Information Substrate for GENI] | OpticalAccessNets |  [wiki:"Data Plane Measurements"]  ||
 [[BR]]