Merge branch 'strangelove' into anticache

Conflicts:
	build.xml
	src/frontend/edu/brown/hstore/HStoreSite.java
	src/frontend/edu/brown/markov/containers/MarkovGraphsContainer.java
	tests/frontend/edu/brown/utils/TestPartitionEstimatorViews.java

.classpath

@@ -23,10 +23,10 @@
 	<classpathentry kind="lib" path="third_party/java/jars/japex.jar"/>
 	<classpathentry kind="lib" path="third_party/java/jars/jcommon-1.0.16.jar"/>
 	<classpathentry kind="lib" path="third_party/java/jars/jfreechart-1.0.13.jar"/>
-	<classpathentry kind="lib" path="third_party/java/jars/jung-algorithms-2.0.jar"/>
+	<classpathentry kind="lib" path="third_party/java/jars/jung-algorithms-2.0.jar" sourcepath="SourceJars/jung-source/jung-algorithms-2.0-sources.jar"/>
 	<classpathentry kind="lib" path="third_party/java/jars/jung-api-2.0.jar"/>
-	<classpathentry kind="lib" path="third_party/java/jars/jung-graph-impl-2.0.jar"/>
-	<classpathentry kind="lib" path="third_party/java/jars/jung-visualization-2.0.jar"/>
+	<classpathentry kind="lib" path="third_party/java/jars/jung-graph-impl-2.0.jar" sourcepath="SourceJars/jung-source/jung-graph-impl-2.0-sources.jar"/>
+	<classpathentry kind="lib" path="third_party/java/jars/jung-visualization-2.0.jar" sourcepath="SourceJars/jung-source/jung-visualization-2.0-sources.jar"/>
 	<classpathentry kind="lib" path="third_party/java/jars/junit-4.4.jar"/>
 	<classpathentry kind="lib" path="third_party/java/jars/log4j-1.2.15.jar" sourcepath="SourceJars/log4j-1.2.15-sources.jar"/>
 	<classpathentry kind="lib" path="third_party/java/jars/opencsv-2.3.jar"/>
@@ -46,6 +46,6 @@
 	<classpathentry kind="lib" path="third_party/java/jars/gdata-media-1.0.jar"/>
 	<classpathentry kind="lib" path="third_party/java/jars/mail.jar"/>
 	<classpathentry kind="lib" path="third_party/java/jars/google-oauth-client-1.8.0-beta.jar"/>
-	<classpathentry kind="lib" path="third_party/java/jars/jline-1.0.jar"/>
+	<classpathentry kind="lib" path="third_party/java/jars/jline-1.0.jar" sourcepath="SourceJars/jline-1.0/src"/>
 	<classpathentry kind="output" path="obj/eclipse"/>
 </classpath>

build-common.xml

@@ -1,3 +1,7 @@
+<!-- DO NOT EDIT THIS FILE - it is machine generated -->
+<!-- See the documentation page on how to add new HStoreConf parameters: -->
+<!-- http://hstore.cs.brown.edu/documentation/development/configuration-properties -->
+
 <!-- GLOBAL -->
 <arg value="global.temp_dir=${global.temp_dir}" />
 <arg value="global.log_dir=${global.log_dir}" />
@@ -69,7 +73,6 @@
 <arg value="site.exec_no_undo_logging=${site.exec_no_undo_logging}" />
 <arg value="site.exec_no_undo_logging_all=${site.exec_no_undo_logging_all}" />
 <arg value="site.exec_force_undo_logging_all=${site.exec_force_undo_logging_all}" />
-<arg value="site.exec_avoid_coordinator=${site.exec_avoid_coordinator}" />
 <arg value="site.exec_db2_redirects=${site.exec_db2_redirects}" />
 <arg value="site.exec_force_singlepartitioned=${site.exec_force_singlepartitioned}" />
 <arg value="site.exec_voltdb_procinfo=${site.exec_voltdb_procinfo}" />
@@ -89,6 +92,7 @@
 <arg value="site.exec_adhoc_sql=${site.exec_adhoc_sql}" />
 <arg value="site.exec_prefetch_queries=${site.exec_prefetch_queries}" />
 <arg value="site.exec_deferrable_queries=${site.exec_deferrable_queries}" />
+<arg value="site.specexec_enable=${site.specexec_enable}" />
 <arg value="site.commandlog_enable=${site.commandlog_enable}" />
 <arg value="site.commandlog_dir=${site.commandlog_dir}" />
 <arg value="site.commandlog_timeout=${site.commandlog_timeout}" />
@@ -115,6 +119,7 @@
 <arg value="site.queue_dtxn_increase=${site.queue_dtxn_increase}" />
 <arg value="site.queue_dtxn_increase_max=${site.queue_dtxn_increase_max}" />
 <arg value="site.mappings_path=${site.mappings_path}" />
+<arg value="site.markov_enable=${site.markov_enable}" />
 <arg value="site.markov_mispredict_recompute=${site.markov_mispredict_recompute}" />
 <arg value="site.markov_path=${site.markov_path}" />
 <arg value="site.markov_path_caching=${site.markov_path_caching}" />