Permalink
Commits on Aug 2, 2016
  1. Merge pull request #193 from basho/bugfix/cv/fix_quorum_calc

    Correct quorum calculation
    angrycub committed on GitHub Aug 2, 2016
  2. Merge pull request #194 from wozniakjan/develop

    Fixing a typo in the UI message
    angrycub committed on GitHub Aug 2, 2016
Commits on Jul 9, 2016
Commits on Mar 4, 2016
  1. Switched to `div` to prevent floating point value

    angrycub committed Mar 4, 2016
  2. Correct quorum calculation

    angrycub committed Mar 4, 2016
Commits on Apr 1, 2015
  1. Merge pull request #186 from basho/bugfix/sdc/xref

    Bump riak_core to 2.1.1, repoint erlydtl dep, fix xref.
    
    Reviewed-by: seancribbs
    borshop committed Apr 1, 2015
Commits on Mar 31, 2015
Commits on Mar 1, 2015
  1. Merge pull request #185 from basho/the-great-versioning

    Updated rebar.config dependency upon riak_core to 2.1.0
    cmeiklejohn committed Mar 1, 2015
  2. Add tools.mk.

    Ignore existing dialyzer warnings.
    cmeiklejohn committed Mar 1, 2015
Commits on Feb 21, 2015
  1. Merge pull request #184 from basho/webmachine

    Bump webmachine.
    cmeiklejohn committed Feb 21, 2015
  2. Bump webmachine.

    cmeiklejohn committed Feb 21, 2015
Commits on Feb 17, 2015
  1. Merge remote-tracking branch 'origin/2.0' into develop

    Conflicts:
    	rebar.config
    cmeiklejohn committed Feb 17, 2015
  2. Merge pull request #183 from basho/fix-rebar-config

    Reflect that the erlydtl dep is a sha and not a tag
    cmeiklejohn committed Feb 17, 2015
Commits on Sep 4, 2014
Commits on Aug 29, 2014
Commits on Jul 23, 2014
Commits on May 9, 2014
  1. Merge pull request #181 from basho/bugfix/jnd/rex

    try/catch for rex error
    joedevivo committed May 9, 2014
  2. Add try/catch error handling for rpc:calls to nodes without running rex

    try/catch for rex error
    
    Wrapped other rpc:calls with try/catch
    
    Added lager warning messages to rex try/catches
    
    Added lager parse transform to rebar.config
    Joe DeVivo committed May 8, 2014
Commits on May 1, 2014
  1. Merge pull request #180 from basho/cv_userlist_schema

    Fix for Issue 179
    slfritchie committed May 1, 2014
Commits on Apr 23, 2014
Commits on Apr 22, 2014
Commits on Jan 31, 2014
  1. Merge pull request #178 from basho/jd-bolth

    Sensible defaults for riak_control
    joedevivo committed Jan 31, 2014
Commits on Jan 30, 2014
  1. Sensible defaults for riak_control

    Joe DeVivo committed Jan 30, 2014
Commits on Jan 13, 2014
  1. Merge pull request #177 from basho/confbal/schema

    Simplified riak_control's cuttlefish schema. CONFBAL STYLE!
    seancribbs committed Jan 13, 2014
Commits on Dec 12, 2013
  1. Merge pull request #176 from basho/jd-cuttlefish-api

    Changes for new cuttlefish api
    joedevivo committed Dec 12, 2013
Commits on Dec 11, 2013
  1. Removed extra io:format from tests

    Joe DeVivo committed Dec 11, 2013
  2. Changes for new cuttlefish api

    Joe DeVivo committed Dec 11, 2013
Commits on Nov 13, 2013
  1. Merge pull request #174 from sideshowcoder/basic-pages-tests

    Provide some basic tests around the RiakControl Main Pages
    cmeiklejohn committed Nov 13, 2013