Some reversions of recent commits re: portfolio failure.
authorMorgan Deters <mdeters@cs.nyu.edu>
Tue, 17 Jun 2014 20:00:50 +0000 (16:00 -0400)
committerlianah <lianahady@gmail.com>
Thu, 19 Jun 2014 22:24:39 +0000 (18:24 -0400)
commit5a7e8c7127ccd914633441adbc039f0c8a1fdac2
tree7deb48979100a5285ed6f87aa8d4b113e55685da
parentbbf11e1b852bd888e4afdf2a80970032d85af898
Some reversions of recent commits re: portfolio failure.

* Partial reversion of b8e28a7, do it a different way.

* Revert "Test portfolio with --no-wait-to-join."
  This reverts commit 8b56004ee8bf6c34aaf045bec12bf0e4401a044c.
.travis.yml
Makefile
src/main/command_executor.h
src/main/driver_unified.cpp