Skip to content

Commit

Permalink
Correct conflict resolution flag in cbrestore
Browse files Browse the repository at this point in the history
  • Loading branch information
mattcarabine committed Jun 14, 2017
1 parent 1940f28 commit d94bab8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions content/cli/cbrestore-tool.dita
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
cases where a document has been recently deleted on the cluster, the document may not be
restored at all due to this conflict resolution.</p><p>To restore the contents of a backup
while overwriting current documents with the same key, pass the extra parameter
<codeph>conflict_resolve=1</codeph> as part of the <cmdname>cbrestore</cmdname> command.
<codeph>conflict_resolve=0</codeph> as part of the <cmdname>cbrestore</cmdname> command.
To ensure that only the documents contained in the backup exist in the bucket after
performing the restore, flush the bucket prior to performing the restore</p>
<b>Tool Location</b><p>The tool is in the following locations:</p><table>
Expand Down Expand Up @@ -253,7 +253,7 @@
</row>
<row>
<entry><codeph>conflict_resolve=1</codeph></entry>
<entry>By default, disable conflict resolution.</entry>
<entry>By default, enable conflict resolution.</entry>
</row>
<row>
<entry><codeph>data_only=0</codeph></entry>
Expand Down

0 comments on commit d94bab8

Please sign in to comment.