changes for merging from asterix_stabilization to asterix_lsm_stabilization (-r1055:1282)

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