=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2012-11-07 07:08:15 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2012-11-07 08:12:06 +0000
@@ -149,6 +149,8 @@
         executeSql( "ALTER TABLE mapview RENAME COLUMN maplegendtype TO legendtype" );
         executeSql( "ALTER TABLE mapview RENAME COLUMN maplegendsetid TO legendsetid" );
         executeSql( "ALTER TABLE mapview ALTER COLUMN opacity TYPE double precision" );
+        
+        executeSql( "ALTER TABLE datavalue ALTER COLUMN storedby TYPE character varying(100)" );
 
         executeSql( "ALTER TABLE maplegend DROP CONSTRAINT maplegend_name_key" );
         

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValue.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValue.hbm.xml	2011-12-19 16:44:56 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValue.hbm.xml	2012-11-07 08:12:06 +0000
@@ -15,7 +15,7 @@
 
     <property name="value" />
 
-    <property name="storedBy" column="storedby" length="31" />
+    <property name="storedBy" column="storedby" length="100" />
 
     <property name="timestamp" column="lastupdated" type="date" />
 

=== modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java'
--- dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java	2012-08-29 15:44:32 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java	2012-11-07 08:12:06 +0000
@@ -291,7 +291,7 @@
         indicatorOperands.retainAll( allOperands );
         
         clock.logTime( "Number of operands with data: " + allOperands.size() + ", " + SystemUtils.getMemoryString() );
-        notifier.notify( id, DATAMART, "Populating crosstabulation table" );
+        notifier.notify( id, DATAMART, "Populating crosstab table" );
 
         // ---------------------------------------------------------------------
         // Create crosstabtable

=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/SystemUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/SystemUtils.java	2012-01-09 20:03:56 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/SystemUtils.java	2012-11-07 08:12:06 +0000
@@ -56,8 +56,9 @@
     
     public static String getMemoryString()
     {
-        return "Mem used: " + ( Runtime.getRuntime().totalMemory() / FACTOR_MB ) + 
-            ", max: " + ( Runtime.getRuntime().maxMemory() / FACTOR_MB ) + 
-            ", free: " + ( Runtime.getRuntime().freeMemory() / FACTOR_MB );
+        return "Mem Total in JVM: " + ( Runtime.getRuntime().totalMemory() / FACTOR_MB ) + 
+            " Free in JVM: " + ( Runtime.getRuntime().freeMemory() / FACTOR_MB ) +
+            " Max Limit: " + ( Runtime.getRuntime().maxMemory() / FACTOR_MB );
+            
     }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm	2012-10-11 16:23:03 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm	2012-11-07 08:12:06 +0000
@@ -19,5 +19,7 @@
   <dt>$i18n.getString( "os_architecture" ):</dt><dd>$systemProperties.get( "os.arch" )</dd>
   <dt>$i18n.getString( "os_version" ):</dt><dd>$systemProperties.get( "os.version" )</dd>
   <dt>$i18n.getString( "server_date" ):</dt><dd>$format.formatDateTime( $serverDate )</dd>
+  <dt>$i18n.getString( "server_memory" ):</dt><dd>$memoryInfo</dd>
+  <dt>$i18n.getString( "cpu_cores" ):</dt><dd>$cpuCores</dd>
   #end
 </dl>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/about/action/AboutAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/about/action/AboutAction.java	2012-10-11 16:23:03 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/about/action/AboutAction.java	2012-11-07 08:12:06 +0000
@@ -42,6 +42,7 @@
 import org.hisp.dhis.i18n.I18n;
 import org.hisp.dhis.system.database.DatabaseInfo;
 import org.hisp.dhis.system.database.DatabaseInfoProvider;
+import org.hisp.dhis.system.util.SystemUtils;
 import org.hisp.dhis.user.CurrentUserService;
 import org.hisp.dhis.util.ContextUtils;
 
@@ -165,6 +166,20 @@
     {
         return serverDate;
     }
+    
+    private String memoryInfo;
+
+    public String getMemoryInfo()
+    {
+        return memoryInfo;
+    }
+
+    private int cpuCores;
+
+    public int getCpuCores()
+    {
+        return cpuCores;
+    }
 
     // -------------------------------------------------------------------------
     // Action implementation
@@ -242,6 +257,10 @@
         
         currentUserIsSuper = currentUserService.currentUserIsSuper();
 
+        memoryInfo = SystemUtils.getMemoryString();
+        
+        cpuCores = SystemUtils.getCpuCores();
+        
         return SUCCESS;
     }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2012-11-03 20:19:30 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2012-11-07 08:12:06 +0000
@@ -352,6 +352,8 @@
 messages=Messages
 interpretations=Interpretations
 interface_style=Interface style
+server_memory=Server memory
+cpu_cores=CPU cores
 
 #-- Change Log------------------------------------------------------------------#
 

=== modified file 'resources/sql/div.sql'
--- resources/sql/div.sql	2012-10-29 10:01:44 +0000
+++ resources/sql/div.sql	2012-11-07 08:12:06 +0000
@@ -90,3 +90,15 @@
 from users u 
 join userinfo ui on u.userid=ui.userinfoid
 order by u.username;
+
+-- Explore report tables
+
+select rt.name, rt.paramleafparentorganisationunit as leaf, 
+rt.paramgrandparentorganisationunit as grand, rt.paramparentorganisationunit as parent,
+(select count(*) from reporttable_dataelements where reporttableid=rt.reporttableid) as de,
+(select count(*) from reporttable_datasets where reporttableid=rt.reporttableid) as ds,
+(select count(*) from reporttable_indicators where reporttableid=rt.reporttableid) as in,
+(select count(*) from reporttable_organisationunits where reporttableid=rt.reporttableid) as ou, 
+(select count(*) from reporttable_orgunitgroups where reporttableid=rt.reporttableid) as oug,
+(select count(*) from reporttable_periods where reporttableid=rt.reporttableid) as pe
+from reporttable rt;