Piotr Kliczewski has uploaded a new change for review. Change subject: core: connection timeout overriden by client timeout ......................................................................
core: connection timeout overriden by client timeout Connection timeout setting was overriden by client timeout. Bug-Url: https://bugzilla.redhat.com/1147487 Change-Id: I6b8b3154071b98f802f001481abf80be5865fe74 Signed-off-by: pkliczewski <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java M ovirt-engine.spec.in M pom.xml 3 files changed, 15 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/66/33666/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java index 2e7392c..7d4bb19 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java @@ -445,9 +445,9 @@ } private void updateHeartbeatPolicy(boolean isheartbeat) { - RetryPolicy policy = client.getRetryPolicy(); + RetryPolicy policy = client.getClientRetryPolicy(); policy.setHeartbeat(isheartbeat); - client.setRetryPolicy(policy); + client.setClientRetryPolicy(policy); } @Override diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index dc413af..6da845f 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -298,7 +298,7 @@ Requires: ovirt-host-deploy-java >= 1.3.0 Requires: python-cheetah Requires: spice-html5 -Requires: vdsm-jsonrpc-java >= 1.0.7 +Requires: vdsm-jsonrpc-java >= 1.0.8 %if %{ovirt_install_systemd} Requires(post): systemd @@ -549,7 +549,7 @@ Requires: openssh-server Requires: ovirt-host-deploy >= 1.3.0 Requires: ovirt-host-deploy-offline >= 1.3.0 -Requires: vdsm-jsonrpc-java >= 1.0.7 +Requires: vdsm-jsonrpc-java >= 1.0.8 %description setup-plugin-allinone All-in-one plugin for %{ovirt_product_name_short}'s setup diff --git a/pom.xml b/pom.xml index 7ef38e9..cb65696 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.ovirt.engine</groupId> <artifactId>root</artifactId> - <version>3.5.1-SNAPSHOT</version> + <version>3.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ovirt-root</name> <description>oVirt Engine Root Project</description> @@ -73,8 +73,8 @@ <sshd-core.version>0.11.0</sshd-core.version> <otopi.version>1.2.0</otopi.version> <ovirt-host-deploy.version>1.3.0</ovirt-host-deploy.version> - <org.ovirt.engine.api.ovirt-engine-extensions-api.version>0.0.1-SNAPSHOT</org.ovirt.engine.api.ovirt-engine-extensions-api.version> - <vdsm-jsonrpc-java.version>1.0.7</vdsm-jsonrpc-java.version> + <org.ovirt.engine.api.ovirt-engine-extensions-api.version>0.0.0-SNAPSHOT</org.ovirt.engine.api.ovirt-engine-extensions-api.version> + <vdsm-jsonrpc-java.version>1.0.8</vdsm-jsonrpc-java.version> <slf4j.version>1.7.5</slf4j.version> <slf4j-jdk14.version>1.5.6</slf4j-jdk14.version> <gwt.version>2.5.1</gwt.version> @@ -82,12 +82,12 @@ <mockito.version>1.9.0</mockito.version> <javassist.version>3.12.0.GA</javassist.version> <javax.mail.version>1.4.4</javax.mail.version> - <hibernate-validator.version>4.0.2.GA</hibernate-validator.version> + <hibernate-validator.version>4.2.0.Final</hibernate-validator.version> <jackson-core-asl.version>1.9.9</jackson-core-asl.version> <jackson-mapper-asl.version>1.9.9</jackson-mapper-asl.version> <commons-configuration.version>1.6</commons-configuration.version> <commons-jxpath.version>1.3</commons-jxpath.version> - <jaxb-impl.version>2.2</jaxb-impl.version> + <jaxb-impl.version>2.2.7</jaxb-impl.version> <jbosssx-bare.version>2.0.4</jbosssx-bare.version> <log4j.version>1.2.16</log4j.version> <infinispan.version>5.2.5.Final</infinispan.version> @@ -113,6 +113,7 @@ <!-- https://jira.codehaus.org/browse/MGWT-350 --> <gwt-maven-plugin.workingRefresh.version>2.4.0</gwt-maven-plugin.workingRefresh.version> <cdi.api.version>1.0-SP4</cdi.api.version> + <antlr.version>4.2.2</antlr.version> </properties> <dependencyManagement> <dependencies> @@ -332,6 +333,11 @@ <version>${cdi.api.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4-runtime</artifactId> + <version>${antlr.version}</version> + </dependency> </dependencies> </dependencyManagement> <dependencies> -- To view, visit http://gerrit.ovirt.org/33666 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b8b3154071b98f802f001481abf80be5865fe74 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Piotr Kliczewski <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
