merge.txt

Updating 4541303..da19df4
Fast-forward (no commit created; -m option ignored)
 src/riak.proto           |  2 ++
 src/riak_dt.proto        |  2 ++
 src/riak_dt_pb.erl       | 23 +++++++++++++++++++++
 src/riak_kv.proto        |  2 ++
 src/riak_kv_pb.erl       | 52 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/riak_pb.erl          | 18 +++++++++++++++++
 src/riak_search.proto    |  2 ++
 src/riak_search_pb.erl   | 22 ++++++++++++++++++++
 src/riak_ts.proto        |  2 ++
 src/riak_ts_pb.erl       | 39 ++++++++++++++++++++++++++++++++++++
 src/riak_yokozuna.proto  |  2 ++
 src/riak_yokozuna_pb.erl | 11 ++++++++++
 12 files changed, 177 insertions(+)