resolved merge conflict

1 files changed, 21 insertions, 12 deletions

diff --git a/lib/Net/Riak.pm b/lib/Net/Riak.pm
index 156779b..77bd773 100644
--- a/lib/Net/Riak.pm
+++ b/lib/Net/Riak.pm
@@ -13,7 +13,7 @@ has client => (
     is       => 'rw',
     isa      => 'Net::Riak::Client',
     required => 1,
-    handles  => [qw/request useragent is_alive/]
+    handles  => [qw/is_alive http_request http_response/]
 );
 
 sub BUILDARGS {
@@ -39,6 +39,8 @@ sub bucket {
     $obj->store;
 
     my $obj = $bucket->get('new_post');
+    my $req = $client->http_request; # last request
+    $client->http_response # last response
 
 =head1 DESCRIPTION
 
@@ -100,17 +102,15 @@ client_id for this client
 
 =back
 
-=head2 METHODS
+=head1 METHODS
 
-=over 4
-
-=item bucket
+=head2 bucket
 
     my $bucket = $client->bucket($name);
 
 Get the bucket by the specified name. Since buckets always exist, this will always return a L<Net::Riak::Bucket>
 
-=item is_alive
+=head2 is_alive
 
     if (!$client->is_alive) {
         ...
@@ -118,31 +118,40 @@ Get the bucket by the specified name. Since buckets always exist, this will alwa
 
 Check if the Riak server for this client is alive
 
-=item add
+=head2 add
 
     my $map_reduce = $client->add('bucket_name', 'key');
 
 Start assembling a Map/Reduce operation
 
-=item link
+=head2 link
 
     my $map_reduce = $client->link();
 
 Start assembling a Map/Reduce operation
 
-=item map
+=head2 map
 
     my $map_reduce = $client->add('bucket_name', 'key')->map("function ...");
 
 Start assembling a Map/Reduce operation
 
-=item reduce
+=head2 reduce
 
     my $map_reduce = $client->add(..)->map(..)->reduce("function ...");
 
 Start assembling a Map/Reduce operation
 
-=back
+=method http_request
 
-=cut
+Returns the HTTP::Request object from the last request
+
+=method http_response
 
+Returns a HTTP::Response object from the last request
+
+=head2 SEE ALSO
+
+Net::Riak::MapReduce
+
+=cut