Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: basho/riak_core
base: cet-bg-mgr-proto
...
head fork: basho/riak_core
compare: 1.4
Commits on Aug 17, 2013
Evan Vigil-McClanahan evanmcc make core aware of possible null returns 6cfa2cb
Commits on Aug 19, 2013
Engel A. Sanchez engelsanchez Add protection against folsom stat errors
Folsom may sometimes return an error tuple if something goes wrong (see
folsom_ets.erl), but our code was only catching exceptions. So the error
would end up being used as a valid value and crash the riak_kv_stat
process later. This fixes that problem and gives us better protection
from folsom funkiness.
586df15
Evan Vigil-McClanahan evanmcc Merge pull request #359 from basho/pevm-drop-bad-data
Corruption filtering changes for core.
84eb7b1
Commits on Aug 20, 2013
Engel A. Sanchez engelsanchez Merge pull request #356 from basho/eas-folsom-stat-error-protection
Add protection against folsom stat errors
41add84
Commits on Aug 23, 2013
Jared Morrow jaredmorrow Roll webmachine dep to 1.10.4 5d6b5b9
Jared Morrow jaredmorrow Roll riak_core version 1.4.2 3352fa2
Commits on Oct 16, 2013
Evan Vigil-McClanahan evanmcc add a simple, point to point capability check for batch message
support. if not, fall back to per-object messages.
1cc206a
Commits on Oct 17, 2013
Evan Vigil-McClanahan evanmcc Merge pull request #429 from basho/pevm-handoff-back-compat
handoff backwards compatability
9ced77a
Commits on Nov 05, 2013
Jared Morrow jaredmorrow Roll riak_core 1.4.3 5e858f9
Commits on Nov 20, 2013
Jared Morrow jaredmorrow Roll riak_core 1.4.4 to pick up lager 2.0.1 b30e356
Commits on Dec 06, 2013
Evan Vigil-McClanahan evanmcc add a timeout to stat calculation so that stuck processes no longer
keep stats from proceeding forever.
ce3d812
Evan Vigil-McClanahan evanmcc bump timeout to 10 seconds address concerns. 13c74c0
Commits on Dec 07, 2013
Evan Vigil-McClanahan evanmcc Merge pull request #467 from basho/pevm-status-safety
Bound the time that stats calculation can take
366b9dd
Commits on Dec 09, 2013
Christopher Meiklejohn cmeiklejohn Provide a synchronous registration and unregistration of services.
Some parts of repl require being able to disable a service and block
until it's disabled.  Provide this API.
ad71bf8
Christopher Meiklejohn cmeiklejohn Merge pull request #470 from basho/feature/csm/sync-service-mgr
Provide a synchronous registration and unregistration of services.
0357ac8
Commits on Dec 10, 2013
Jared Morrow jaredmorrow Clean up deps in rebar.config to make it easier to parse 7a77024
Commits on Dec 11, 2013
Christopher Meiklejohn cmeiklejohn Remove connection manager and service manager. c9090d8
Christopher Meiklejohn cmeiklejohn Merge pull request #476 from basho/feature/csm/reorganize
Remove connection manager and service manager.
26a287a
Christopher Meiklejohn cmeiklejohn Extract riak_core_connection and tests. b9eb8f6
Christopher Meiklejohn cmeiklejohn Merge pull request #479 from basho/feature/csm/move-connection
Extract riak_core_connection and tests.
9595a36
Commits on May 20, 2014
Ryan Zezeski rzezeski Use raw ring when setting bucket props
Fix the ring trans function used by `set_bucket` so that it uses the
passed-in, raw ring.  This is important because otherwise things like
bucket prop fixups which are performed on "my ring" can leak into the
raw ring casuing issues such as a Riak Searh pre-commit hook that
exists even when the search property is set to false.
7bff033
Commits on May 22, 2014
Ryan Zezeski rzezeski Merge pull request #584 from basho/bugfix/set-bucket-1.4
Bugfix/set bucket 1.4
58dcfaf
Commits on May 27, 2014
Jared Morrow jaredmorrow Update protobuff dep to pick up meck dep change 27a0d43
Commits on Jul 02, 2014
jcapricebasho jcapricebasho Backport of PR #603 to 1.4 branch bef78d2
Commits on Jul 03, 2014
Jon Meredith jonmeredith Merge pull request #610 from basho/bugfix/jc/reip-update-claimant
Backport of PR #603 to 1.4 branch
083287b
Commits on Jul 07, 2014
Jared Morrow jaredmorrow Roll version riak_core 1.4.10 c769123
Commits on Nov 17, 2014
Russell Brown russelldb Allow the vnode to change/provide the request to be forwarded 76cbdc2
Russell Brown russelldb Add erlang_version file for buildbot 5febb47
Russell Brown russelldb Sprinkle with `non_strict` and bake at 190C for 20 minutes 4a38a91
Commits on Nov 19, 2014
Scott Lystig Fritchie slfritchie Work around buildbot braindamage 6525a03
Bishop Bors borshop Merge pull request #651 from basho/rdb/kv-gh1046
Allow the vnode to change/provide the request to be forwarded

Reviewed-by: slfritchie,slfritchie
ca54001
Engel A. Sanchez engelsanchez Tagging 1.4.12 201f048
Commits on Nov 20, 2014
Engel A. Sanchez engelsanchez Preparing for 1.4.12 release
Fixing meck dependency mismatches
96c981f