merge.txt

Updating 9bbb0bf..c7b7dfe
Fast-forward (no commit created; -m option ignored)
 .thumbs.yml                             |  2 +-
 riak_test/yz_solr_upgrade_downgrade.erl |  5 -----
 src/yz_solr_proc.erl                    | 24 +++++++++++++++++++++++-
 test/eqc_util.erl                       |  3 +++
 test/yz_solrq_eqc.erl                   |  1 +
 5 files changed, 28 insertions(+), 7 deletions(-)