tree d24f8576988b18123126b837e6874f4effdac78c
parent 9082e6c30078959be43207ad561cf414a0984261
parent 36103bf6adae0a357c02e3e767099d3465e22756
author zheilbron <zheilbron@gmail.com> 1382724425 -0700
committer zheilbron <zheilbron@gmail.com> 1382724425 -0700

Merge branch 'master' into zheilbron/asterix_msr_demo

Conflicts:
	asterix-algebra/src/main/java/edu/uci/ics/asterix/optimizer/rules/RemoveUnusedOneToOneEquiJoinRule.java
	asterix-app/src/main/java/edu/uci/ics/asterix/api/http/servlet/RESTAPIServlet.java
	asterix-app/src/test/resources/runtimets/testsuite.xml