Changes between Version 50 and Version 51 of SpiralFour

Timestamp:

01/17/12 11:16:38 (12 years ago)

Author:

hmussman@bbn.com

Comment:

--

SpiralFour

@@ -32 +32 @@
   || ''Extended Deployments'' || [wiki:WiMAXInteg  Extended WiMAX Sites] | [wiki:WIMXCL WiMAX at Clemson University] | [wiki:WIMXMI WiMAX at University of Michigan] | [wiki:WIMXWS WiMAX at Wayne State University]  | [wiki:WIMXTU WiMAX at Temple University]  | [wiki:WIMXDU WiMAX at Drexel University] | [wiki:WIMXUWI2 Extended WiMAX at University of Wisconsin] | [wiki:WIMXRG2 Extended WiMAX at Rutgers WINLAB and UCLA]  | [wiki:WIMXBBN2 Extended WiMAX at BBN Technologies]  ||
   || ''Mobile Station Platforms'' || [wiki:WiMAXInteg  WiMAX Mobile Stations]  ||
-  || ''Experiments''  ||  '[wiki:WiMAXInteg  WiMAX Demos] | [wiki:WiMAXExper  WiMAX Experiments] ||
+  || ''Experiments''  ||  [wiki:WiMAXExper  WiMAX Experimenter Info and Tutorials] | [wiki:WiMAXExper  WiMAX Demos and Experiments] ||
   || ''Operations''  ||  ||
 [[BR]]
@@ -46 +46 @@
   || ''Compute Aggregates'' ||  ''PlanetLab'' |  ''[wiki:ProtoGENI]'' | [wiki:PrimoGENI] ||
   || ''Cloud Aggregates'' || [wiki:GENICloud GENICloud] |  [wiki:DICLOUD  Data Intensive Cloud Control]  ||
-  || ''Integration'' ||  [http://groups.geni.net/geni/wiki/ClusterD  ORCA Cluster] | [wiki:OKGEMS  OKGems] | ''[wiki:CmuLab CMULab]'' ||
+  || ''Integration'' || [wiki:PLfed PlanetLab Federation] | [http://groups.geni.net/geni/wiki/ClusterD  ORCA Cluster Integration] | [wiki:OKGEMS  OKGems] | ''[wiki:CmuLab CMULab]'' ||
   || ''Wireless Aggregates'' ||  ''[wiki:DOME]''  |  ''[wiki:ORBIT]'' | [wiki:COGRADIO Cognitive Radio]  | ''[wiki:MPRADIO  Cognitive Radio Study]''  ||
   || ''Sensor Aggregates''  ||  ''[wiki:ViSE]''  |  ''[wiki:KanseiSensorNet  Kansei Sensor Networks]'' ||
@@ -58 +58 @@
 
 == 8. GENI Instrumentation and Measurement (I&M) Tools ==
-  || ''Activities''  ||  [wiki:GeniInstMeas  Meetings] ||
-  || ''Architecture and Design'' ||  [wiki:GeniInstMeas  Work in Progress] ||
+  || ''Activities''  ||  [wiki:GeniInstMeas  Meetings] | [wiki:GeniInstMeas  Goals] |  [wiki:GeniInstMeas  Design Topics]  ||
+  || ''Architecture and Design'' ||  [wiki:GeniInstMeas  Architecture] | NetKarma  ||
   || ''Meso-Scale I&M Tools'' || GEMINI | GIMI |  [wiki:Shadow Shadownet] ||
-  || ''I&M tools'' || InstrumentationTools | [wiki:ScalableMonitoring]  | MeasurementSystem |  [wiki:VMI-FED] | [wiki:OnTimeMeasure] | [wiki:LEARN  LEARN] |  [wiki:IMF  IMF] |  DigitalObjectRegistry | NetKarma ||
-  || ''I&M Services'' ||  ||
-  || ''Measurement Point Aggregates''  ||   ||
-  || ''Completed Projects'' ||  [wiki:"Embedded Real-Time Measurements" Embedded Real-Time Measurements (ERM)] | [wiki:"Data Plane Measurements"] |   [wiki:"Data Plane Measurements"  Data Plane Measurement Study]  ||
+  || ''I&M Tools'' || InstrumentationTools | [wiki:OnTimeMeasure] | [wiki:ScalableMonitoring]  || 
+  || ''I&M Services'' || DigitalObjectRegistry |  [wiki:IMF  IMF] ||
+  || ''Measurement Point (MP) Aggregates''  ||  [wiki:DICLOUD  Data Intensive Cloud Control]   | ''[wiki:ViSE]''  |  ''MeasurementSystem'' | ''[wiki:"Embedded Real-Time Measurements" Embedded Real-Time Measurements (ERM)]'' | ''[wiki:LEARN  LEARN]'' |    [wiki:VMI-FED]   ||
+  || ''Experiments'' || [wiki:GeniInstMeas  Guide to GENI I&M Tools and Services] | [wiki:GeniInstMeas  GENI I&M Tutorials and Evaluations] |  [wiki:OnTimeMeasure] |  [wiki:"Data Plane Measurements"] |   [wiki:"Data Plane Measurements"  Data Plane Measurement Study]  ||
 [[BR]]