Merge pull request #24 from OpenRiak/nhse-o34-orkv.i42-aae_tree_exclude

Add new bucket type default - by default buckets will NOT be excluded

Author: martinsumner

src/riak_core_bucket_props.erl

@@ -188,6 +188,8 @@ resolve_prop({sync_on_write, _}, {sync_on_write, one}) ->
     one;
 resolve_prop({sync_on_write, one}, {sync_on_write, _}) ->
     one;
+resolve_prop({aae_tree_exclude, Excl1}, {aae_tree_exclude, Excl2}) ->
+    Excl1 andalso Excl2;
 resolve_prop({_, V1}, {_, _V2}) ->
     V1.
 

src/riak_core_bucket_type.erl

@@ -163,6 +163,7 @@ common_defaults() ->
      {notfound_ok, true},
      {n_val,3},
      {last_write_wins,false},
+     {aae_tree_exclude, false},
      {precommit, []},
      {postcommit, []},
      {chash_keyfun, {riak_core_util, chash_std_keyfun}}].