killbill-memoizeit

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/NodeInfoJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/NodeInfoJson.java
index 5da94b8..62477c9 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/NodeInfoJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/NodeInfoJson.java
@@ -19,11 +19,16 @@ package org.killbill.billing.jaxrs.json;
 
 import java.util.List;
 
+import org.joda.time.DateTime;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class NodeInfoJson {
 
+    private final String nodeName;
+    private final DateTime bootTime;
+    private final DateTime lastUpdatedDate;
     private final String kbVersion;
     private final String apiVersion;
     private final String pluginApiVersion;
@@ -32,12 +37,18 @@ public class NodeInfoJson {
     private final List<PluginInfoJson> pluginsInfo;
 
     @JsonCreator
-    public NodeInfoJson(@JsonProperty("kbVersion") final String kbVersion,
+    public NodeInfoJson(@JsonProperty("nodeName") final String nodeName,
+                        @JsonProperty("bootTime") final DateTime bootTime,
+                        @JsonProperty("lastUpdatedDate") final DateTime lastUpdatedDate,
+                        @JsonProperty("kbVersion") final String kbVersion,
                         @JsonProperty("apiVersion") final String apiVersion,
                         @JsonProperty("pluginApiVersion") final String pluginApiVersion,
                         @JsonProperty("commonVersion") final String commonVersion,
                         @JsonProperty("platformVersion") final String platformVersion,
                         @JsonProperty("pluginsInfo") final List<PluginInfoJson> pluginsInfo) {
+        this.nodeName = nodeName;
+        this.bootTime = bootTime;
+        this.lastUpdatedDate = lastUpdatedDate;
         this.kbVersion = kbVersion;
         this.apiVersion = apiVersion;
         this.pluginApiVersion = pluginApiVersion;
@@ -46,6 +57,18 @@ public class NodeInfoJson {
         this.pluginsInfo = pluginsInfo;
     }
 
+    public String getNodeName() {
+        return nodeName;
+    }
+
+    public DateTime getBootTime() {
+        return bootTime;
+    }
+
+    public DateTime getLastUpdatedDate() {
+        return lastUpdatedDate;
+    }
+
     public String getKbVersion() {
         return kbVersion;
     }

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/NodesInfoResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/NodesInfoResource.java
index cff110d..8316517 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/NodesInfoResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/NodesInfoResource.java
@@ -124,7 +124,10 @@ public class NodesInfoResource extends JaxRsResourceBase {
                     }
                 }));
 
-                return new NodeInfoJson(input.getKillbillVersion(),
+                return new NodeInfoJson(input.getNodeName(),
+                                        input.getBootTime(),
+                                        input.getLastUpdatedDate(),
+                                        input.getKillbillVersion(),
                                         input.getApiVersion(),
                                         input.getPluginApiVersion(),
                                         input.getCommonVersion(),