Permalink
Commits on Mar 15, 2017
Commits on Mar 3, 2017
Commits on Dec 1, 2016
  1. Merge pull request #108 from basho/coughlan-thumbs

    coughlan committed on GitHub Dec 1, 2016
    Add thumbs.
  2. Add thumbs.

    coughlan committed on GitHub Dec 1, 2016
Commits on Nov 16, 2016
Commits on Nov 7, 2016
  1. Update riak_core to 2.1.8

    Brett Hazen committed Nov 7, 2016
Commits on Oct 11, 2016
  1. Updated dependencies.

    fadushin committed Oct 11, 2016
Commits on Oct 5, 2016
Commits on Sep 30, 2016
  1. Lock riak_core to 2.1.6

    Brett Hazen committed Sep 30, 2016
Commits on Feb 29, 2016
  1. Merge pull request #104 from basho/dr/update_riak_core_to_develop-2.2

    borshop committed Feb 29, 2016
    Update to point to develop-2.2 branch of riak_core
    
    Reviewed-by: JeetKunDoug
  2. Update to point to develop-2.2 branch of riak_core

    JeetKunDoug committed Feb 29, 2016
Commits on Oct 17, 2015
  1. Merge pull request #101 from basho/deps/jv/update-develop-dependencies

    borshop committed Oct 17, 2015
    Update dependencies for develop branch
    
    Reviewed-by: JeetKunDoug
Commits on Oct 16, 2015
  1. Update dependencies for develop branch

    jvoegele committed Oct 16, 2015
    The dependency on riak_core was set to `{tag, "2.1.1"}`, which was
    causing version conflicts, so update to `{branch, "develop"}` instead.
Commits on Jul 2, 2015
Commits on Mar 31, 2015
  1. Merge pull request #97 from basho/feature/bump-core-2.1.1

    borshop committed Mar 31, 2015
    Bump riak_core to 2.1.1
    
    Reviewed-by: zeeshanlakhani
  2. Bump riak_core to 2.1.1

    seancribbs committed Mar 31, 2015
Commits on Mar 1, 2015
  1. Merge pull request #96 from basho/the-great-versioning

    borshop committed Mar 1, 2015
    Pin the rebar.config to riak_core version 2.1.0
    
    Reviewed-by: cmeiklejohn
  2. Pin the rebar.config to riak_core version 2.1.0

    Brett Hazen committed Mar 1, 2015
Commits on Feb 26, 2015
  1. Merge pull request #95 from basho/17

    borshop committed Feb 26, 2015
    Add Erlang 17 support.
    
    Reviewed-by: mrallen1
  2. Add Erlang 17 support.

    cmeiklejohn committed Feb 26, 2015
Commits on Feb 13, 2015
  1. Merge pull request #92 from basho/bugfix/ku/add-probe-logmsg

    borshop committed Feb 13, 2015
    Add log message to probe ambigious error
    
    Reviewed-by: cmeiklejohn
  2. Merge pull request #93 from basho/develop-2.0-merge

    borshop committed Feb 13, 2015
    Develop 2.0 merge.
    
    Reviewed-by: zeeshanlakhani
Commits on Feb 12, 2015
  1. Merge remote-tracking branch 'origin/2.0' into develop-2.0-merge

    cmeiklejohn committed Feb 12, 2015
    Conflicts:
    	rebar.config
Commits on Jan 22, 2015
Commits on Dec 10, 2014
  1. Merge pull request #91 from basho/uw-use-exometer-core

    borshop committed Dec 10, 2014
    Use exometer_core & exometer aliases
    
    Reviewed-by: jburwell
  2. Remove exometer instructions from Makefile

    uwiger committed Nov 25, 2014
    add aliases together with new stats
    
    fix type spec for riak_pipe_stat:stats()
Commits on Nov 20, 2014
  1. Merge pull request #90 from basho/uw-remove-afunix

    borshop committed Nov 20, 2014
    Remove afunix from EXOMETER_PACKAGES.
    
    Reviewed-by: jburwell
Commits on Nov 19, 2014
  1. Remove afunix from EXOMETER_PACKAGES.

    uwiger committed Nov 19, 2014
    Afunix is not used at this time, and may cause build issues on some
    platforms.
Commits on Nov 17, 2014
  1. Merge pull request #89 from basho/feuerlabs-exometer4

    borshop committed Nov 17, 2014
    Introduce exometer metrics into 2.0
    
    Reviewed-by: jburwell
  2. change travis script

    uwiger committed Nov 17, 2014
  3. Introduce exometer metrics into 2.0

    uwiger committed Nov 10, 2014
Commits on Sep 4, 2014
  1. Set rebar.config deps back to 2.0 branches

    Jared Morrow committed Sep 4, 2014
  2. Merge branch '2.0' into develop

    Jared Morrow committed Sep 4, 2014
Commits on Aug 29, 2014
  1. Update dependencies to point to tags for 2.0

    Jared Morrow committed Aug 29, 2014