Permalink
Commits on Aug 15, 2012
  1. Merge branch '1.2' into master

    Conflicts:
    	rebar.config
    Bryan Fink committed Aug 15, 2012
  2. Merge branch 'bwf-riak-pipe-48' into 1.2

    Bryan Fink committed Aug 15, 2012
Commits on Aug 11, 2012
  1. Change riak_pipe dependency to point at branch to bring in point rele…

    …ase changes
    Jared Morrow committed Aug 11, 2012
  2. Make eleveldb dependency a wildcard on the version

    Jared Morrow committed Aug 11, 2012
Commits on Aug 10, 2012
  1. Merge pull request #360 from basho/sdc-fix-eunit-failures

    Fix eunit failures
    seancribbs committed Aug 10, 2012
Commits on Aug 8, 2012
  1. Address review comments and fix startup problems.

    * Don't call application:unload/1.
    * Don't start folsom since it is an included application of riak_core.
    * Improve the documentation on new riak_kv_test_util functions.
    seancribbs committed Aug 8, 2012
  2. Fix syntax error.

    seancribbs committed Jul 3, 2012
  3. Fix vnode_status_test_.

    seancribbs committed Jul 3, 2012
  4. Factor out the common setup/cleanup stuff into riak_kv_test_util so w…

    …e can use it elsewhere.
    seancribbs committed Jul 3, 2012
  5. Fix keys_fsm_eqc test.

    * New keys_fsm requires ack_keys when backpressure is turned on.
    * Correct the startup order of applications based on reltool's computed list.
    * Use the memory backend and its reset() function instead of deleting keys.
    * Isolate the state directory of the test to .eunit/keys_fsm_eqc.
    * Cleanup ring files in the state directory before the test instead of rejiggering the ring.
    * Use a consistent node name and use longnames so that the put_fsm doesn't get confused.
    * Wait for KV application and service to start rather than using an arbitrary sleep.
    seancribbs committed Jul 3, 2012
Commits on Aug 6, 2012
  1. Merge branch '1.2'

    Conflicts:
    	rebar.config
    Jared Morrow committed Aug 6, 2012
  2. Fix dependency revisions for 1.2.0 release

    Jared Morrow committed Aug 6, 2012
Commits on Aug 2, 2012
  1. Remove the async_folds option passed into the backend at startup.

    The original design for async folding support had the backend make
    the decision to use async folding at start time, but we changed to
    having the decision be made per fold call. This change removes some
    leftover cruft from that original path that is now obsolete.
    kellymclaughlin committed Aug 2, 2012
Commits on Jul 31, 2012
  1. catch noproc in index and listkeys coverage pipe link (basho/riak_pip…

    …e#48)
    
    It is possible that the coverage fsm handling the index query at the head of a pipe
    will finish (or otherwise exit) before we try to link to it. This patch wraps the
    link in a try-catch to prevent a 'noproc' exit (if the coverage fsm did finish
    successfully faster than expected, we want to pick up the 'done' message from our
    inbox).
    
    The listkeys pipe coverage fitting had the same potential problem.
    Bryan Fink committed Jul 31, 2012
  2. Merge pull request #376 from basho/jdm-warn-on-eleveldb-block-size

    Added warning if eleveldb block_size is set.
    jonmeredith committed Jul 31, 2012
Commits on Jul 30, 2012
  1. Merge pull request #375 from glickbot/1.2

    Fixed referer validation false negatives
    jonmeredith committed Jul 30, 2012
Commits on Jul 27, 2012
Commits on Jul 25, 2012
  1. Merge branch '1.2'

    Jared Morrow committed Jul 25, 2012