Clone
zheilbron <zheilbron@gmail.com>
committed
on 26 Nov 13
Merge branch 'master' into zheilbron/hyracks_msr_demo
Conflicts:
hyracks/hyracks-control/hyracks-control-nc/src/main/java/edu/uci/ics/hyrac… Show more
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

Show less

master + 7 more