tree da146116c1c61bbee16d0dd1979e0ce7fe773577
parent d85a6a2110fea4b6f01f02d37710fc8f04bd9c73
author buyingyi <buyingyi@eaa15691-b419-025a-1212-ee371bd00084> 1365065380 +0000
committer buyingyi <buyingyi@eaa15691-b419-025a-1212-ee371bd00084> 1365065380 +0000

merge back the fixes for issue285 and issue288: r1477:1478 and r1481:1482 from asterix_issue285

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