| commit | b385095168b5bdc4e57f709e29c619ad39cf888c | [log] [tgz] |
|---|---|---|
| author | zheilbron <zheilbron@gmail.com> | Tue Nov 19 12:17:30 2013 -0800 |
| committer | zheilbron <zheilbron@gmail.com> | Tue Nov 19 12:17:30 2013 -0800 |
| tree | 95f6222716256ff1e9116c5f8c9b702b9a54e1ec | |
| parent | 251c341dad3b6217cd61cb5d27914bdac52a29a1 [diff] | |
| parent | 8ae9941a604cd5a22de5145c601021208ef3bee1 [diff] |
Merge branch 'master' into zheilbron/hyracks_msr_demo Conflicts: hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/lifecycle/LifeCycleComponentManager.java