tree 6ac581137f2071a7a2afbcb27e330352ec9b6333
parent 60a3531b91f5d2ab06532bb9cb0741f2f82ff040
parent 9b45ea84121f9e8e3c9346bac0eed9faaf1ba118
author zheilbron <zheilbron@eaa15691-b419-025a-1212-ee371bd00084> 1356911581 +0000
committer zheilbron <zheilbron@eaa15691-b419-025a-1212-ee371bd00084> 1356911581 +0000

merged r1017:1055 asterix_stabilization

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