| commit | ed499899bcca815b2cc66cd9def237b6cc8bf8e3 | [log] [tgz] |
|---|---|---|
| author | zheilbron <zheilbron@gmail.com> | Wed Jan 15 14:30:09 2014 -0800 |
| committer | zheilbron <zheilbron@gmail.com> | Wed Jan 15 14:30:09 2014 -0800 |
| tree | 6f488090df4fe8b4a917a42daeaf1e33adcf8264 | |
| parent | d16cd80a97f81338aa0ceec18d1587aef98d027d [diff] | |
| parent | aa89009750bf17e24d07883f61fe0c0296f4d3a3 [diff] |
Merge branch 'master' into eugenia/black_cherry_stable Conflicts: asterix-app/src/main/java/edu/uci/ics/asterix/api/http/servlet/RESTAPIServlet.java asterix-app/src/main/java/edu/uci/ics/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java