tree fef26231627712e9df8b6d789d0f92b2f73df638
parent 4ce2aa54f7cc975b4f3ee30bfa3f31f4c1fe14ad
parent a81ddbc6e31625d91a941da97b997c3738574447
author ecarm002@ucr.edu <ecarm002@ucr.edu> 1376679273 -0700
committer ecarm002@ucr.edu <ecarm002@ucr.edu> 1376679273 -0700

Merged hyracks master back into VXQuery branch.