tree e75c3747b28bb6468e4dbc01a6b30e2599ddb209
parent f373130c5505bcbfac140849f39ae578639b54b0
parent 4a346eac2a7ab9fe70f3d43f044bdf7732bfc012
author kisskys <kisskys@123451ca-8445-de46-9d55-352943316053> 1363996175 +0000
committer kisskys <kisskys@123451ca-8445-de46-9d55-352943316053> 1363996175 +0000

merged from fullstack_asterix_stabilization to fullstack_lsm_staging -r3100:3171

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