apavlo/h-store — pull request #63 by ambell (2012-05-15 18:51:32+00:00)
Title: Pull request for deferred queries project

Can you pull up "to pushing it up to the butler right after verifying that junit passes" (commit: d60297bb8a167e202725345a8b7f86880bd488e8)? It's also build #9 on Jenkins http://graffiti.cs.brown.edu:8080/job/H-Store__ambell/9/.

Whenever I pull down the new master and merge, I go through the merge conflicts on the few files I actually touched, and it says everything is successful, then when I go to compile I get 100 errors from h-store/src/protorpc/ca/evanjones/protorpc/Protocol.java and Counter.java saying I'm missing packages.