| commit | 2ccbe42b03581a1a4971888d236b64410b8eb933 | [log] [tgz] |
|---|---|---|
| author | Zachary Heilbron <zheilbron@gmail.com> | Thu Mar 06 12:19:50 2014 -0800 |
| committer | Zachary Heilbron <zheilbron@gmail.com> | Thu Mar 06 12:19:50 2014 -0800 |
| tree | 5d586aba6888f7391152d1cf61ac0f7a70aee84f | |
| parent | ed499899bcca815b2cc66cd9def237b6cc8bf8e3 [diff] | |
| parent | 8937e6ea375a87c051719945a509e3b2c5b41f08 [diff] |
Merge branch 'master' into eugenia/black_cherry_stable Conflicts: asterix-app/src/main/java/edu/uci/ics/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java