tree 4e187279edd53b59e0b96c1920eee66ab5beaac5
parent 88f4804c40e37487af4c17477dbf8e6bc4e542d8
parent a7ee757b99727ee3f9beffde69d067da2593cd5d
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