tree f0c3632886a11280f1bc0307ef4bab06e70747ba
parent 27a0c4c2fd043642b96aa7bd376a2ee5f0dcfa67
parent b92490cf5069e96ba1b1e91c3048bd1d5be18ac6
author ramangrover29 <ramangrover29@gmail.com> 1366746454 -0700
committer ramangrover29 <ramangrover29@gmail.com> 1366746454 -0700

1) merge from asterix_lsm_stabilization 2) added properties to asterix configuration xml following appends to google doc