- 
                Notifications
    You must be signed in to change notification settings 
- Fork 72
          Merge riak/2.1 branch to master 
          #977
        
          New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
          
     Open
      
      
            JeetKunDoug
  wants to merge
  20
  commits into
  master
  
    
      
        
          
  
    
      Choose a base branch
      
     
    
      
        
      
      
        
          
          
        
        
          
            
              
              
              
  
           
        
        
          
            
              
              
           
        
       
     
  
        
          
            
          
            
          
        
       
    
      
from
merge/dr/merge_2.1_to_master
  
      
      
   
  
    
  
  
  
 
  
      
    base: master
Could not load branches
            
              
  
    Branch not found: {{ refName }}
  
            
                
      Loading
              
            Could not load tags
            
            
              Nothing to show
            
              
  
            
                
      Loading
              
            Are you sure you want to change the base?
            Some commits from the old base branch may be removed from the timeline,
            and old review comments may become outdated.
          
          
                
     Open
            
            
          Conversation
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
    … extractors test (cherry picked from commit 844ee9c)
…s-as-per-PR866 yokozuna_rt additions for types and better testing w/ allow-mult=true…
Add debugging to rt:do_commit/1 to track nothing_planned
…debug Merge riak_test 2.0 onto 2.1
Updated to attempt to make sure we get the "right" vnode PID.
sure up possible race between upgrade and first check
This makes it much easier to tell which code is being executed at a given point in the log, since many of the tests print identical log messages.
Log the start of each test in repl_aae_fullsync
overriding default_bucket_props in advanced_config without explicitly setting these returns different values with the fix for allow_mult turning to true with an app.config file present.
…nt_default_bucket_properties Update tests for different default bucket properties
face of indeterminate behavior.
…_fixes Forward port changes to proxy_overload_recovery to make it pass in the face of indeterminate behavior.
Move wait_for_vnode_change inside the -ifdef(EQC) clause.
      
     Closed
  
  
    Sign up for free
    to join this conversation on GitHub.
    Already have an account?
    Sign in to comment
  
      
  Add this suggestion to a batch that can be applied as a single commit.
  This suggestion is invalid because no changes were made to the code.
  Suggestions cannot be applied while the pull request is closed.
  Suggestions cannot be applied while viewing a subset of changes.
  Only one suggestion per line can be applied in a batch.
  Add this suggestion to a batch that can be applied as a single commit.
  Applying suggestions on deleted lines is not supported.
  You must change the existing code in this line in order to create a valid suggestion.
  Outdated suggestions cannot be applied.
  This suggestion has been applied or marked resolved.
  Suggestions cannot be applied from pending reviews.
  Suggestions cannot be applied on multi-line comments.
  Suggestions cannot be applied while the pull request is queued to merge.
  Suggestion cannot be applied right now. Please check back later.
  
    
  
    
Pulling in updates to tests, especially changes that deal with allow_mult/dvv_enabled.