You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vg...@apache.org on 2011/12/12 18:28:51 UTC
svn commit: r1213330 - in /incubator/ambari/trunk: CHANGES.txt
client/src/main/java/org/apache/ambari/common/rest/agent/HeartBeat.java
Author: vgogate
Date: Mon Dec 12 17:28:51 2011
New Revision: 1213330
URL: http://svn.apache.org/viewvc?rev=1213330&view=rev
Log:
AMBARI-154. Exception while starting the controller. Outdated JAXB fields in HeartBeat class
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/HeartBeat.java
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1213330&r1=1213329&r2=1213330&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Mon Dec 12 17:28:51 2011
@@ -2,6 +2,8 @@ Ambari Change log
Release 0.1.0 - unreleased
+ AMBARI-154. Exception while starting the controller. Outdated JAXB fields in HeartBeat class (vgogate)
+
AMBARI-153. Introduce a 'ambari.properties' configuration file that
can specify 'data.store' and a url. It defaults to 'zk://localhost:2181/',
but can be set to 'test:/' to get the static storage. (omalley)
Modified: incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/HeartBeat.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/HeartBeat.java?rev=1213330&r1=1213329&r2=1213330&view=diff
==============================================================================
--- incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/HeartBeat.java (original)
+++ incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/rest/agent/HeartBeat.java Mon Dec 12 17:28:51 2011
@@ -35,8 +35,8 @@ import javax.xml.bind.annotation.XmlType
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {"responseId","timestamp",
- "hostname", "hardwareProfile", "installedRoleStates",
- "serverStates", "deployState", "actionResults", "idle"})
+ "hostname", "hardwareProfile", "installedRoleStates", "installScriptHash",
+ "actionResults", "idle"})
public class HeartBeat {
@XmlElement
private short responseId = -1;