1) fixed issue 506 (BetaBlocker) 2) configurable CC ports 3) cosmetic changes for indented output of describe -admin command
diff --git a/asterix-installer/src/main/resources/clusters/local/local.xml b/asterix-installer/src/main/resources/clusters/local/local.xml
index 3f739de..58d0f97 100644
--- a/asterix-installer/src/main/resources/clusters/local/local.xml
+++ b/asterix-installer/src/main/resources/clusters/local/local.xml
@@ -6,11 +6,6 @@
</working_dir>
<log_dir>/tmp/asterix/logs</log_dir>
<txn_log_dir>/tmp/asterix/logs</txn_log_dir>
- <ports>
- <cluster_port>1099</cluster_port>
- <client_port>1098</client_port>
- <http_port>8888</http_port>
- </ports>
<iodevices>/tmp</iodevices>
<store>asterix/storage</store>
<java_home></java_home>
@@ -18,6 +13,9 @@
<id>master</id>
<client_ip>127.0.0.1</client_ip>
<cluster_ip>127.0.0.1</cluster_ip>
+ <cluster_port>1099</cluster_port>
+ <client_port>1098</client_port>
+ <http_port>8888</http_port>
</master_node>
<node>
<id>node1</id>
diff --git a/asterix-installer/src/main/resources/conf/asterix-configuration.xml b/asterix-installer/src/main/resources/conf/asterix-configuration.xml
index 8394a96..c9907e3 100644
--- a/asterix-installer/src/main/resources/conf/asterix-configuration.xml
+++ b/asterix-installer/src/main/resources/conf/asterix-configuration.xml
@@ -80,14 +80,6 @@
</property>
<property>
- <name>txn.log.directory</name>
- <value>asterix_logs/</value>
- <description>The directory location for transaction logs. (Default =
- "asterix_logs/")
- </description>
- </property>
-
- <property>
<name>txn.log.buffer.numpages</name>
<value>8</value>
<description>The number of in-memory log buffer pages. (Default = "8")