merge.txt

Updating cb15cc4..a976aa3
Fast-forward (no commit created; -m option ignored)
 .gitignore                     |     1 -
 .travis.yml                    |    15 +-
 Makefile                       |     5 +
 README.md                      |     3 +-
 dialyzer.ignore-warnings       |     4 +-
 include/riak_dt_pb.hrl         |   159 +
 include/riak_kv_pb.hrl         |   475 ++
 include/riak_pb.hrl            |   140 +
 include/riak_pb_kv_codec.hrl   |     2 +-
 include/riak_search_pb.hrl     |   172 +
 include/riak_ts_pb.hrl         |   298 +
 include/riak_yokozuna_pb.hrl   |    77 +
 plugins/riak_pb_msgcodegen.erl |     2 +-
 protogen.config                |    41 +
 rebar.config                   |     7 +-
 src/riak_dt_pb.erl             |  5060 +++++++++++++
 src/riak_kv_pb.erl             | 15393 +++++++++++++++++++++++++++++++++++++++
 src/riak_pb.app.src            |     3 +-
 src/riak_pb.erl                |  4699 ++++++++++++
 src/riak_pb_codec.erl          |    29 +-
 src/riak_pb_dt_codec.erl       |    21 +-
 src/riak_pb_kv_codec.erl       |     8 +
 src/riak_pb_messages.erl       |   235 +
 src/riak_search_pb.erl         |  5791 +++++++++++++++
 src/riak_ts_pb.erl             |  8902 ++++++++++++++++++++++
 src/riak_yokozuna_pb.erl       |  1915 +++++
 test/encoding_test.erl         |    55 +-
 27 files changed, 43435 insertions(+), 77 deletions(-)
 create mode 100644 include/riak_dt_pb.hrl
 create mode 100644 include/riak_kv_pb.hrl
 create mode 100644 include/riak_pb.hrl
 create mode 100644 include/riak_search_pb.hrl
 create mode 100644 include/riak_ts_pb.hrl
 create mode 100644 include/riak_yokozuna_pb.hrl
 create mode 100644 protogen.config
 create mode 100644 src/riak_dt_pb.erl
 create mode 100644 src/riak_kv_pb.erl
 create mode 100644 src/riak_pb.erl
 create mode 100644 src/riak_pb_messages.erl
 create mode 100644 src/riak_search_pb.erl
 create mode 100644 src/riak_ts_pb.erl
 create mode 100644 src/riak_yokozuna_pb.erl