| commit | db0583de50b9e7e5ef4a855b6e1d0c76698cfeda | [log] [tgz] |
|---|---|---|
| author | zheilbron <zheilbron@gmail.com> | Wed Jun 05 00:02:08 2013 -0700 |
| committer | zheilbron <zheilbron@gmail.com> | Wed Jun 05 00:02:08 2013 -0700 |
| tree | 376fcc64f7b97623bb36bbfbcb064619888c3e5d | |
| parent | 46ed71502b287847a100fa026ca7109d3616bf17 [diff] | |
| parent | a6ae41ab0dfd4d2386d282ce352605eeba2cf6d1 [diff] |
Merge branch 'master' of https://code.google.com/p/asterixdb Conflicts: asterix-common/src/main/java/edu/uci/ics/asterix/common/config/AsterixStorageProperties.java asterix-installer/src/main/resources/conf/asterix-configuration.xml