Skip to content

Commit

Permalink
Back port of Riak 2.2 into 2.0.
Browse files Browse the repository at this point in the history
This is a largely clean merge of the 2.1.7 tag into the develop-2.0 branch:
  * Some minor merge conflicts, mostly concerning dependencies (which will need to be revisited) and docs
  * Manually removed following features that went into 2.0:
    - Upgrade to Solr 4.10
    - AAE throttling
    - Job control switches
    - Changes due to Riak 2.2 AAE hashing changes

This change requires back port of riak_kv (TBD)
  • Loading branch information
fadushin committed Nov 21, 2016
2 parents 94e847b + 6cf80ad commit 782f0dd
Show file tree
Hide file tree
Showing 52 changed files with 3,693 additions and 2,548 deletions.
9 changes: 9 additions & 0 deletions .thumbs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
minimum_reviewers: 2
build_steps:
- make clean
- make test
- make xref
- make dialyzer
merge: false
org_mode: true
timeout: 1790
7 changes: 0 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,6 @@ clean:
distclean: clean
$(REBAR) delete-deps

# You should 'clean' before your first run of this target
# so that deps get built with PULSE where needed.
pulse:
./rebar compile -D PULSE
./rebar eunit -D PULSE skip_deps=true suite=$(PULSE_TESTS)


##
## Dialyzer
##
Expand Down
74 changes: 0 additions & 74 deletions debug/yz_perf.erl

This file was deleted.

6 changes: 6 additions & 0 deletions dialyzer.ignore-warnings
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,14 @@ Unknown functions:
riakc_pb_socket:start_link/2
riakc_pb_socket:stop/1
riakc_pb_socket:update_type/4
riakc_pb_socket:create_search_index/3
riakc_pb_socket:get_search_index/3
riakc_pb_socket:set_options/2
riakc_register:set/2
riakc_set:add_element/2
riakc_set:new/0
riakc_set:to_op/1
rt:admin/2
rt:build_cluster/1
rt:build_cluster/2
rt:clean_data_dir/2
Expand Down Expand Up @@ -100,6 +104,8 @@ Unknown functions:
rt:partition/2
rt:wait_until_transfers_complete/1
rt:log_to_nodes/2
rt:start/1
rt:upgrade/4
yz_solr_orig:index_batch_orig/2
yz_solrq_drain_mgr_orig:drain_orig/1
yz_solrq_drain_mgr_orig:unlink_and_kill_orig/2
Expand Down
258 changes: 51 additions & 207 deletions docs/BATCHING.md

Large diffs are not rendered by default.

Loading

0 comments on commit 782f0dd

Please sign in to comment.