merge.txt

Updating 94e847b..0dcf191
Fast-forward (no commit created; -m option ignored)
 .gitignore                                         |   2 +
 .thumbs.yml                                        |   9 +
 Makefile                                           |   7 -
 debug/yz_perf.erl                                  |  74 --
 dialyzer.ignore-warnings                           |   6 +
 docs/BATCHING.md                                   | 258 ++----
 docs/yz-batching-overview.graffle                  | 926 ++++++++++----------
 docs/yz-batching-overview.png                      | Bin 40754 -> 43649 bytes
 include/yokozuna.hrl                               |  22 +-
 priv/conf/solrconfig.xml                           |   2 +-
 priv/yokozuna.schema                               |  64 +-
 rebar.config                                       |  12 +-
 riak_test/intercepts/yz_solr_intercepts.erl        |   4 +-
 .../intercepts/yz_solrq_drain_fsm_intercepts.erl   |  27 +-
 riak_test/yokozuna_essential.erl                   |  26 +-
 riak_test/yz_aae_test.erl                          | 107 +--
 riak_test/yz_dt_test.erl                           |  16 +-
 riak_test/yz_faceted_search.erl                    |   8 +-
 riak_test/yz_pb.erl                                |  28 +-
 riak_test/yz_rt.erl                                | 215 +++--
 riak_test/yz_solrq_test.erl                        | 250 +++---
 riak_test/yz_stat_test.erl                         | 132 ++-
 src/yz_app.erl                                     |   7 +-
 src/yz_console.erl                                 |  38 +-
 src/yz_doc.erl                                     |  11 +-
 src/yz_dt_extractor.erl                            |   3 +-
 src/yz_entropy_mgr.erl                             |   6 +-
 src/yz_events.erl                                  |   3 +
 src/yz_exchange_fsm.erl                            | 129 ++-
 src/yz_fuse.erl                                    |  12 +
 src/yz_index_hashtree.erl                          | 148 +++-
 src/yz_kv.erl                                      | 155 +---
 src/yz_misc.erl                                    |   2 +-
 src/yz_pb_admin.erl                                |   7 +-
 src/yz_pb_search.erl                               |   4 +-
 src/yz_solr.erl                                    | 134 +--
 src/yz_solr_proc.erl                               |  77 +-
 src/yz_solrq.erl                                   | 190 ++--
 src/yz_solrq_drain_fsm.erl                         | 182 +++-
 src/yz_solrq_drain_mgr.erl                         | 129 ++-
 src/yz_solrq_helper.erl                            | 393 +++++----
 src/yz_solrq_queue_pair_sup.erl                    |  92 ++
 src/yz_solrq_sup.erl                               | 125 ++-
 src/yz_solrq_worker.erl                            | 972 ++++++++++-----------
 src/yz_stat.erl                                    |  40 +
 src/yz_wm_search.erl                               |   4 +-
 test/yokozuna_schema_tests.erl                     |  60 +-
 test/yz_component_tests.erl                        |   2 +-
 test/yz_solrq_eqc.erl                              | 181 ++--
 test/yz_solrq_eqc_fuse.erl                         |   6 -
 test/yz_solrq_eqc_ibrowse.erl                      |  24 +-
 51 files changed, 2830 insertions(+), 2501 deletions(-)
 create mode 100644 .thumbs.yml
 delete mode 100644 debug/yz_perf.erl
 create mode 100644 src/yz_solrq_queue_pair_sup.erl