tree 32ec4972c9e3b6958afebd56e4fb61bf7382fe71
parent 92de3603b601f9df857af46c5623655810c8f4aa
parent fbf80a9f1d0dd72c34581d166b01f74cd87aaaf0
author zheilbron <zheilbron@gmail.com> 1385430033 -0800
committer zheilbron <zheilbron@gmail.com> 1385430033 -0800

Merge branch 'master' into zheilbron/hyracks_msr_demo

Conflicts:
	hyracks/hyracks-control/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/NodeControllerService.java