Permalink
Switch branches/tags
Commits on Sep 8, 2015
  1. Merge pull request #778 from basho/metadata_callbacks

    borshop committed Sep 8, 2015
    Event notifications when bucket types are stored by the riak_core_metadata_manager.
    
    Reviewed-by: hmmr
  2. Event notifications when bucket types are stored by the riak_core_met…

    andytill
    andytill committed Sep 8, 2015
    …adata_manager.
Commits on Aug 26, 2015
  1. re-pin eleveldb for e2e/ts

    hmmr committed Aug 26, 2015
  2. restrict lager Vsn for e2e/ts

    hmmr committed Aug 26, 2015
  3. pin riak_sysmon for e2e/ts

    hmmr committed Aug 26, 2015
  4. pin exometer_pipe for e2e/ts

    hmmr committed Aug 26, 2015
Commits on Aug 22, 2015
Commits on Aug 21, 2015
  1. Merge pull request #772 from basho/fix/az/pin-eleveldv-to-branch-prot…

    hmmr committed Aug 21, 2015
    …otype/timeseries-range-scan
    
    pin eleveldb dependency on branch prototype/timeseries-range-scan
Commits on Aug 20, 2015
Commits on Aug 19, 2015
  1. Merge pull request #771 from basho/gg/integration/timeseries

    borshop committed Aug 19, 2015
    Extend the riak_core_coverge_fsm to handle colocated data
    
    Reviewed-by: andytill
  2. removed tabs

    Gordon Guthrie
    Gordon Guthrie committed Aug 19, 2015
  3. dialyzer warning fixed

    Gordon Guthrie
    Gordon Guthrie committed Aug 19, 2015
Commits on Jul 28, 2015
  1. Merge pull request #756 from basho/dtr/forward_merge_2.1

    borshop committed Jul 28, 2015
    Forward merge 2.1 into develop, with some changes
    
    Reviewed-by: nickelization
Commits on Jul 27, 2015
  1. Forward merging 2.1 back to develop. Removing mode of legacy gossip a…

    JeetKunDoug committed Jul 27, 2015
    …gain as we don't need all of it for 2.NEXT (and only reverted the PR in 2.1 for backward-compatibility of a few riak_core APIs). Retained riak_core_ring:upgrade/downgrade to maintain compatibility with riak_repl.
Commits on Jul 23, 2015
  1. Merge pull request #754 from basho/nem-clique-0.3.2-version-bump

    borshop committed Jul 23, 2015
    Bump clique to version 0.3.2
    
    Reviewed-by: mrallen1
Commits on Jul 10, 2015
  1. Bump clique to version 0.3.2

    nickelization committed Jul 10, 2015
    The new version of clique includes several bugfixes over 0.3.1
Commits on Jul 9, 2015
  1. Merge pull request #751 from basho/dtr/revert_legacy_gossip_removal

    borshop committed Jul 9, 2015
    Revert removal of legacy gossip as it is a breaking API change.
    
    Reviewed-by: jonmeredith
  2. Revert removal of legacy gossip as it is a breaking API change.

    JeetKunDoug committed Jul 9, 2015
    - Found when trying to update MDC to riak_core/2.1
Commits on Jul 7, 2015
  1. Merge pull request #750 from basho/dtr/forward_merge_2.0

    borshop committed Jul 7, 2015
    Forward merge 2.0 to 2.1
    
    Reviewed-by: zeeshanlakhani
Commits on Jul 2, 2015
  1. Merge branch '2.0' into forward_merge_2.0

    JeetKunDoug committed Jul 2, 2015
    Conflicts:
    	rebar.config
Commits on Jun 25, 2015
  1. Bumped exometer_core to pick up meck 0.8.2

    buildbot
    buildbot committed Jun 25, 2015
Commits on Jun 24, 2015
  1. Merge pull request #748 from basho/nem-clique-0.3.1-version-bump

    borshop committed Jun 24, 2015
    Update riak_core to use clique 0.3.1
    
    Reviewed-by: cuyler
  2. Update riak_core to use clique 0.3.1

    nickelization committed Jun 24, 2015
    We don't currently need to use the new features of clique 0.3.1, but it
    won't hurt to update, and we need the latest clique version for the data
    platform so this will help prevent version conflicts.
Commits on Jun 23, 2015
  1. Merge pull request #747 from basho/nem-clique-0.3.0

    borshop committed Jun 23, 2015
    Update riak_core to use clique 0.3.0
    
    Reviewed-by: paegun
  2. Update riak_core to use clique 0.3.0

    nickelization committed Jun 23, 2015
    Clique 0.3.0 introduces an extra argument that's passed to the command
    callbacks. The existing code in riak_core that uses clique doesn't need
    this extra argument, so we can just ignore it, but we still need to add
    an extra _ argument at the beginning of each command callback.
Commits on Jun 20, 2015
  1. Merge pull request #732 from basho/bugfix/2.0-sysmon-long-schedule-po…

    cmeiklejohn committed Jun 20, 2015
    …rt-handler
    
    Teach the sysmon handler about long schedules on ports.
Commits on Jun 6, 2015
  1. Merge pull request #742 from orivej/update-readme

    borshop committed Jun 6, 2015
    Update link to "Where To Start With Riak Core"
    
    Reviewed-by: cmeiklejohn
Commits on Jun 3, 2015
  1. Merge pull request #741 from basho/bugfix/csm/revert-tainted-ring-bug

    borshop committed Jun 3, 2015
    Revert typo.
    
    Reviewed-by: jonmeredith
  2. Revert typo.

    cmeiklejohn committed Jun 3, 2015
    Revert a typo introduced by 727fa77, where the wrong ring is selected and returned.  This results certain test configurations dumping hundreds of tainted ring errors into the log.
    
    2015-06-03 14:02:04.865 [error] <0.135.0>@riak_core_ring:check_tainted:209 Error: riak_core_ring/ring_ready called on tainted ring

    2015-06-03 14:02:04.865 [info] <0.135.0>@riak_core_gossip:log_node_added:354 'dev2@127.0.0.1' joined cluster with status 'joining'

    2015-06-03 14:02:04.865 [error] <0.135.0>@riak_core_ring:check_tainted:209 Error: Persisting tainted ring
Commits on May 29, 2015
  1. Merge pull request #728 from basho/bugfix/jrd/edoc

    borshop committed May 29, 2015
    Minor fixes to allow make docs to succeed
    
    Reviewed-by: cmeiklejohn