2.0

include/riakc.hrl

@@ -24,7 +24,7 @@
 -define(PROTO_MAJOR, 1).
 -define(PROTO_MINOR, 0).
 -define(DEFAULT_PB_TIMEOUT, 60000).
--define(FIRST_RECONNECT_INTERVAL, 100).
+-define(FIRST_RECONNECT_INTERVAL, 10).
 -define(MAX_RECONNECT_INTERVAL, 30000).
 
 -type client_option()  :: queue_if_disconnected |
@@ -33,7 +33,8 @@
                           auto_reconnect |
                           {auto_reconnect, boolean()} |
                           keepalive |
-                          {keepalive, boolean()}.
+                          {keepalive, boolean()} |
+                          {stats, non_neg_integer()}.
 %% Options for starting or modifying the connection:
 %% `queue_if_disconnected' when present or true will cause requests to
 %% be queued while the connection is down. `auto_reconnect' when

src/riakc.app.src

@@ -1,13 +1,21 @@
 %% -*- erlang -*-
 {application, riakc,
  [{description, "Riak Client"},
-  {vsn, git},
+  {vsn, "2.0"},
   {applications, [
                   kernel,
                   stdlib,
                   riak_pb
                  ]},
   {registered, []},
+  {modules, [riakc_counter,
+             riakc_datatype,
+             riakc_flag,
+             riakc_map,
+             riakc_obj,
+             riakc_pb_socket,
+             riakc_register,
+             riakc_set]},
   {env, [
          %% Set default timeout for operations.
          %% Individual operation timeouts can be supplied,

src/riakc_obj.erl

@@ -67,7 +67,8 @@
          clear_links/1,
          delete_links/2,
          set_link/2,
-         add_link/2
+         add_link/2,
+         is_riakc_obj/1
         ]).
 %% Internal library use only
 -export([new_obj/4,index_id_to_bin/1]).
@@ -575,6 +576,9 @@ add_link(MD, [{T, IdList} | Rest]) ->
             add_link(MD2, Rest)
     end.
 
+is_riakc_obj(#riakc_obj{}) -> true;
+is_riakc_obj(_)            -> false.
+
 %% @doc  INTERNAL USE ONLY.  Set the contents of riakc_obj to the
 %%       {Metadata, Value} pairs in MVs. Normal clients should use the
 %%       set_update_[value|metadata]() + apply_updates() method for changing