| commit | a082fa74db87bb5703fde4e07c8ab106a9660d78 | [log] [tgz] |
|---|---|---|
| author | zheilbron <zheilbron@gmail.com> | Mon Nov 25 17:40:33 2013 -0800 |
| committer | zheilbron <zheilbron@gmail.com> | Mon Nov 25 17:40:33 2013 -0800 |
| tree | bd7ed03f68cba5224938f3173ab47d07671d9e05 | |
| parent | b385095168b5bdc4e57f709e29c619ad39cf888c [diff] | |
| parent | 65829654836b13f61f8d02b77685549ba6afde49 [diff] |
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