tree 2e66912b65c00621a54e05f70636eafa9667a6c8
parent 12ea93840a321066d8f133d0b5eaf8107f3550e5
parent fd2223fca3fdb6118a68b64384de6fc5a9b16506
author zheilbron <zheilbron@eaa15691-b419-025a-1212-ee371bd00084> 1349152570 +0000
committer zheilbron <zheilbron@eaa15691-b419-025a-1212-ee371bd00084> 1349152570 +0000

merged asterix_stabilization r751:755 to asterix_lsm_stabilization

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