[Swift-commit] r7973 - in trunk/src: . org/griphyn/vdl/util

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2014-07-04 13:29:09 -0500 (Fri, 04 Jul 2014)
New Revision: 7973

Modified:
   trunk/src/
   trunk/src/org/griphyn/vdl/util/VDL2Config.java
Log:
removed kickstart and graph options; we can get graph information from the log


Property changes on: trunk/src
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/release-0.94/src:6283-6619,6999-7001,7125
/trunk/src:6214,6255,6275-6618
   + /branches/release-0.94/src:6283-6619,6999-7001,7125
/branches/release-0.95/src:7921
/trunk/src:6214,6255,6275-6618

Modified: trunk/src/org/griphyn/vdl/util/VDL2Config.java
===================================================================
--- trunk/src/org/griphyn/vdl/util/VDL2Config.java	2014-07-04 18:28:21 UTC (rev 7972)
+++ trunk/src/org/griphyn/vdl/util/VDL2Config.java	2014-07-04 18:29:09 UTC (rev 7973)
@@ -97,14 +97,9 @@
 		put(VDL2ConfigProperties.TC_FILE, "${swift.home}/etc/tc.data", ConfigPropertyType.FILE);
 		put(VDL2ConfigProperties.LAZY_ERRORS, "false", ConfigPropertyType.BOOLEAN);
 		put(VDL2ConfigProperties.CACHING_ALGORITHM, "LRU", ConfigPropertyType.STRING);
-		put(VDL2ConfigProperties.PGRAPH, "false", ConfigPropertyType.BOOLEAN);
-		put(VDL2ConfigProperties.PGRAPH_GRAPH_OPTIONS, "splines=\"compound\", rankdir=\"TB\"", ConfigPropertyType.STRING);
-		put(VDL2ConfigProperties.PGRAPH_NODE_OPTIONS, "color=\"seagreen\", style=\"filled\"", ConfigPropertyType.STRING);
 		put(VDL2ConfigProperties.CLUSTERING_ENABLED, "false", ConfigPropertyType.BOOLEAN);
 		put(VDL2ConfigProperties.CLUSTERING_QUEUE_DELAY, "4", ConfigPropertyType.INT);
 		put(VDL2ConfigProperties.CLUSTERING_MIN_TIME, "60", ConfigPropertyType.INT);
-		put(VDL2ConfigProperties.KICKSTART_ENABLED, "maybe", ConfigPropertyType.choices("true", "false", "maybe"));
-		put(VDL2ConfigProperties.KICKSTART_ALWAYS_TRANSFER, "false", ConfigPropertyType.BOOLEAN);
 		put("throttle.submit", "4", ConfigPropertyType.INT);
 		put("throttle.host.submit", "2", ConfigPropertyType.INT);
 		put("throttle.transfers", "4", ConfigPropertyType.INT);