Merge branch 'master' of github.com:synrc/kvs

include/kvs.hrl

@@ -48,7 +48,7 @@
 -record(block,     {left,right,name,last}).
 -record(log,       {?CONTAINER, name, acc}).
 -record(operation, {?ITERATOR(log), body=[], name=[], status=[]}).
--record(kvs,       {mod,cx}).
+-record(kvs,       {mod = store_mnesia,cx}).
 
 -compile({no_auto_import,[put/2]}).
 

src/kvs.erl

@@ -65,7 +65,7 @@ stop(#kvs{mod=DBA}) -> DBA:stop().
 change_storage(Type) -> [ change_storage(Name,Type) || #table{name=Name} <- kvs:tables() ].
 change_storage(Table,Type,#kvs{mod=DBA}) -> DBA:change_storage(Table,Type).
 destroy(#kvs{mod=DBA}) -> DBA:destroy().
-join(Node,#kvs{mod=DBA}) -> DBA:join(Node), rotate_new(), load_partitions(), load_config().
+join(Node,#kvs{mod=DBA}) -> R = DBA:join(Node), rotate_new(), load_partitions(), {R,load_config()}.
 version(#kvs{mod=DBA}) -> DBA:version().
 tables() -> lists:flatten([ (M:metainfo())#schema.tables || M <- modules() ]).
 table(Name) when is_atom(Name) -> lists:keyfind(rname(Name),#table.name,tables());