Code

Merge riak/2.1 branch to master #977

Code

Open

JeetKunDoug wants to merge 20 commits intomasterbasho/riak_test:masterfrom merge/dr/merge_2.1_to_masterbasho/riak_test:merge/dr/merge_2.1_to_masterCopy head branch name to clipboard

+170-54

Commits

Commits on Oct 13, 2015

• yokozuna_rt additions for types and better testing w/ allow-mult=true extractors test

  Show description for 81d74cd
  zeeshanlakhani

  committed
  81d74cd

  Copy full SHA for 81d74cd

Commits on Oct 27, 2015

• Merge pull request #886 from basho/backport/zl/yz_extractors+rt-fixums-as-per-PR866

  Show description for 6f0e534
  fadushin

  committed
  6f0e534

  Copy full SHA for 6f0e534

Commits on Nov 10, 2015

• Add debugging to rt:do_commit/1 to track nothing_planned

  

  Brett Hazen

  committed
  a255cc1

  Copy full SHA for a255cc1

• Merge pull request #925 from basho/bugfix/bch/add-cluster-commit-logging

  Show description for 1b34707
  

  Brett Hazen

  committed
  1b34707

  Copy full SHA for 1b34707

• Merge branch 'riak/2.0' into merge/bch/2.0to2.1-cluster-commit-debug

  

  Brett Hazen

  committed
  78096fa

  Copy full SHA for 78096fa

• Merge pull request #926 from basho/merge/bch/2.0to2.1-cluster-commit-debug

  Show description for f65bf6f
  

  Brett Hazen

  committed
  f65bf6f

  Copy full SHA for f65bf6f

Commits on Nov 16, 2015

• Updated to attempt to make sure we get the "right" vnode PID.

  

  Doug Rohrer

  committed
  ce8ef79

  Copy full SHA for ce8ef79

• Merge pull request #930 from basho/dr/check_vnode_for_liveliness

  Show description for 5c2c474
  JeetKunDoug

  committed
  5c2c474

  Copy full SHA for 5c2c474

Commits on Nov 18, 2015

• sure up possible race between upgrade and first check

  zeeshanlakhani

  committed
  867dc1a

  Copy full SHA for 867dc1a

• Merge pull request #932 from basho/release-time/zl/sure-up-yz_extractors

  Show description for cc05f86
  zeeshanlakhani

  committed
  cc05f86

  Copy full SHA for cc05f86

Commits on Nov 24, 2015

• Log the start of each test in repl_aae_fullsync

  Show description for d855c1f
  nickelization

  committed
  d855c1f

  Copy full SHA for d855c1f

• Merge pull request #939 from basho/repl_aae_fullsync-logging

  Show description for 60577a5
  JeetKunDoug

  committed
  60577a5

  Copy full SHA for 60577a5

• Updated tests to explicitly set allow_mult and dvv_enabled, as

  Show description for 619b24e
  

  Doug Rohrer

  committed
  619b24e

  Copy full SHA for 619b24e

• Fix misplaced character in ensemble_util config

  nickelization

  committed
  8e5b9a8

  Copy full SHA for 8e5b9a8

Commits on Nov 25, 2015

• Merge pull request #942 from basho/dr/bugfix/update_tests_for_different_default_bucket_properties

  Show description for 288fc66
  JeetKunDoug

  committed
  288fc66

  Copy full SHA for 288fc66

Commits on Dec 1, 2015

• Forward port changes to proxy_overload_recovery to make it pass in the

  Show description for 57659d3
  

  Doug Rohrer

  committed
  57659d3

  Copy full SHA for 57659d3

• Merge pull request #947 from basho/dr/forward/proxy_overload_recovery_fixes

  Show description for 010c35a
  JeetKunDoug

  committed
  010c35a

  Copy full SHA for 010c35a

Commits on Dec 9, 2015

• Move wait_for_vnode_change inside the -ifdef(EQC) clause.

  tburghart

  committed
  2c2e57d

  Copy full SHA for 2c2e57d

• Merge pull request #956 from basho/bugfix/trb/fix-build-without-eqc

  Show description for d76c933
  JeetKunDoug

  committed
  d76c933

  Copy full SHA for d76c933

Commits on Jan 22, 2016

• Merge branch 'riak/2.1' into merge/dr/merge_2.1_to_master

  

  Doug Rohrer

  committed
  eec0b42

  Copy full SHA for eec0b42