tree 8940aea040cc52fd566842a85f6790aeb7ea5a3a
parent dc35e3bce552d0492c9a3028c674585969738208
parent 169b8ece9d33424fea078beec97efe62c8f96748
author kisskys <kisskys@eaa15691-b419-025a-1212-ee371bd00084> 1365573782 +0000
committer kisskys <kisskys@eaa15691-b419-025a-1212-ee371bd00084> 1365573782 +0000

merge -r1655:1701 from asterix_lsm_stabilization to asterix_lsm_stabilization_kisskys

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