From: Brett Smith <brett@curoverse.com>
Date: Tue, 3 May 2016 19:22:33 +0000 (-0400)
Subject: Merge branch '9120-node-manager-search-ex-methods-wip'
X-Git-Tag: 1.1.0~952
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/497fdb2505efa9a3231c39ec696da6b749d30af2

Merge branch '9120-node-manager-search-ex-methods-wip'

Closes #9120, #9124.
---

497fdb2505efa9a3231c39ec696da6b749d30af2