tree de44980efb12c22706ef3b5f05ee055f171a121f
parent 82673b4b98e1570dcdbe336c4cbf313e21c67023
parent b1828f947c9dbba4d25938ae344ff30ffbe0b14d
author kisskys <kisskys@eaa15691-b419-025a-1212-ee371bd00084> 1363999792 +0000
committer kisskys <kisskys@eaa15691-b419-025a-1212-ee371bd00084> 1363999792 +0000

merged -r1282:1373 from asterix_stabilization to asterix_lsm_stabilization

git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_lsm_stabilization@1384 eaa15691-b419-025a-1212-ee371bd00084