| commit | df680668d9438f9e82d50757e71776bed1278084 | [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 | f7ea2c8dc18e45371f4aa54a949bd8122c4cd932 | |
| parent | a716af069314c808532e86da639e208834f6d2c0 [diff] | |
| parent | 1feaebd67a6331efc17fe9f7891c05ba7622caf8 [diff] |
Merge branch 'master' into zheilbron/hyracks_msr_demo Conflicts: hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/lifecycle/LifeCycleComponentManager.java