You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by lm...@apache.org on 2014/08/19 05:11:42 UTC
git commit: KNOX-410 - set topology name back to original value after
deploying _default topology
Repository: knox
Updated Branches:
refs/heads/master 9aaeeed17 -> e60357c60
KNOX-410 - set topology name back to original value after deploying _default topology
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/e60357c6
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/e60357c6
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/e60357c6
Branch: refs/heads/master
Commit: e60357c60a8ce93a6b5332a217d447a48d2872e1
Parents: 9aaeeed
Author: Larry McCay <lm...@hortonworks.com>
Authored: Mon Aug 18 23:11:23 2014 -0400
Committer: Larry McCay <lm...@hortonworks.com>
Committed: Mon Aug 18 23:11:23 2014 -0400
----------------------------------------------------------------------
CHANGES | 6 ++++++
.../src/main/java/org/apache/hadoop/gateway/GatewayServer.java | 1 +
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/knox/blob/e60357c6/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 2a7abfe..3067131 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,10 @@
------------------------------------------------------------------------------
+Release Notes - Apache Knox - Version 0.5.0
+------------------------------------------------------------------------------
+** Bug
+ * [KNOX-410] - TopologyService Incorrect when _default Topology is Deployed
+
+------------------------------------------------------------------------------
Release Notes - Apache Knox - Version 0.4.0
------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/knox/blob/e60357c6/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java
index 92faa17..c701fb3 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java
@@ -430,6 +430,7 @@ public class GatewayServer {
if (topology.getName().equals(config.getDefaultTopologyName())) {
topology.setName("_default");
handleCreateDeployment(topology, deployDir);
+ topology.setName(config.getDefaultTopologyName());
}
} else {
auditor.audit( Action.REDEPLOY, topology.getName(), ResourceType.TOPOLOGY, ActionOutcome.UNAVAILABLE );