| commit | aadfa4a26a5b7be87e2f2c96d9d1871f9058abcb | [log] [tgz] |
|---|---|---|
| author | zheilbron <zheilbron@gmail.com> | Wed May 08 20:32:10 2013 -0700 |
| committer | zheilbron <zheilbron@gmail.com> | Wed May 08 20:32:10 2013 -0700 |
| tree | ed361b4c4387cd307878eb92dbfb73248e281658 | |
| parent | dd47dce200294d8c8eb4c916408b33014fb739c2 [diff] | |
| parent | 4fe9f2ac3fad294b96bb0acedcbcdd3a0b7fc954 [diff] |
Merge branch 'master' into zheilbron/asterix_lsm_stabilization_config_changes Conflicts: asterix-common/src/main/java/edu/uci/ics/asterix/common/config/AsterixProperties.java asterix-installer/src/main/resources/conf/asterix-configuration.xml