You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/04/17 17:10:57 UTC
svn commit: r1468961 - in /accumulo/trunk: ./ assemble/ core/ examples/
fate/src/main/java/org/apache/accumulo/fate/
fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/
server/src/main/java/org/apache/accumulo/server/monitor/servlets/ src/
Author: ecn
Date: Wed Apr 17 15:10:56 2013
New Revision: 1468961
URL: http://svn.apache.org/r1468961
Log:
ACCUMULO-1059 applying Supun Kamburugamuva's patch to use 24-hour time
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/examples/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed)
accumulo/trunk/pom.xml (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/GcStatusServlet.java
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1468958
Merged /accumulo/branches/1.5:r1468959
Merged /accumulo/branches/1.4:r1468958
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src/assemble:r1468958
Merged /accumulo/branches/1.4/assemble:r1468958
Merged /accumulo/branches/1.5/assemble:r1468959
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1468959
Merged /accumulo/branches/1.4/core:r1468958
Merged /accumulo/branches/1.4/src/core:r1468958
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src/examples:r1468958
Merged /accumulo/branches/1.5/examples:r1468959
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1468959
Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1468958
Merged /accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1468958
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1468958
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1468959
Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1468958
Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/pom.xml:r1468959
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/server:r1468958
Merged /accumulo/branches/1.5/server:r1468959
Merged /accumulo/branches/1.4/src/server:r1468958
Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/GcStatusServlet.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/GcStatusServlet.java?rev=1468961&r1=1468960&r2=1468961&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/GcStatusServlet.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/GcStatusServlet.java Wed Apr 17 15:10:56 2013
@@ -17,6 +17,7 @@
package org.apache.accumulo.server.monitor.servlets;
import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -42,7 +43,7 @@ public class GcStatusServlet extends Bas
if (status != null) {
Table gcActivity = new Table("gcActivity", "Collection Activity");
gcActivity.addSortableColumn("Activity");
- gcActivity.addSortableColumn("Finished", new DateTimeType(DateFormat.MEDIUM, DateFormat.SHORT), null);
+ gcActivity.addSortableColumn("Finished", new DateTimeType(new SimpleDateFormat("MMM dd, yyyy kk:mm")), null);
gcActivity.addSortableColumn("Candidates", new NumberType<Long>(), null);
gcActivity.addSortableColumn("Deleted", new NumberType<Long>(), null);
gcActivity.addSortableColumn("In Use", new NumberType<Long>(), null);
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1468958
Merged /accumulo/branches/1.4/src/src:r1468958
Merged /accumulo/branches/1.5/src:r1468959