tree b6dafa24751d29c4076bd4329fea44bd9c16f039
parent 86749c12632c83bd99095fbe5abae9192cef5c20
parent c07725a883b73803cce40b59aaede6e8d62f069e
author zheilbron <zheilbron@123451ca-8445-de46-9d55-352943316053> 1364341695 +0000
committer zheilbron <zheilbron@123451ca-8445-de46-9d55-352943316053> 1364341695 +0000

merged fullstack_asterix_stabilization -r3171:3236 --> fullstack_lsm_staging

git-svn-id: https://hyracks.googlecode.com/svn/branches/fullstack_lsm_staging@3263 123451ca-8445-de46-9d55-352943316053