Commits

Anonymous committed 9430586 Merge

merge

  • Participants
  • Parent commits aa00283, 3dff242

Comments (0)

Files changed (3)

File config/riak.erlenv

 {riak_heart_command, "(cd /path/to/riak; ./start-restart.sh /path/to/riak/config/riak.erlenv)"}.
 {riak_nodename, riak}.
 {riak_hostname, "127.0.0.1"}.
-{jiak_web_ip, "127.0.0.1"}.
-{jiak_web_port, 8098}.
+{riak_web_ip, "127.0.0.1"}.
+{riak_web_port, 8098}.
 {jiak_name, "jiak"}.

File scripts/make_appfile.sh

 prefix=""
 modules=$(
     for f in $(ls src/*.erl); do 
-        echo -n "$prefix'$(basename -s .erl $f)'"
+        echo -n "$prefix'$(basename $f .erl)'"
         prefix=", "
     done)
 sed "s/__MODULES__/$modules/g" <src/riak.app.src 

File src/riak_bucket.erl

 get_bucket(Name, Ring) ->
     case riak_ring:get_meta({bucket, Name}, Ring) of
         undefined -> [{name,Name},{n_val,3},{allow_mult,true},
-                      {linkfun,linkfun_unset}, % override for linkwalking!
+                      {linkfun,{modfun, jiak_object, mapreduce_linkfun}},
                       {old_vclock, 86400},{young_vclock, 21600},
                       {big_vclock, 50}, {small_vclock, 10}];
         {ok, Bucket} -> Bucket