update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / rocksdb / java / src / main / java / org / rocksdb / TransactionDBOptions.java

diff --git a/ceph/src/rocksdb/java/src/main/java/org/rocksdb/TransactionDBOptions.java b/ceph/src/rocksdb/java/src/main/java/org/rocksdb/TransactionDBOptions.java
index 76f545cde6a434053d071e1fcf208ddd8be549e4..7f4296a7c98845c454e2742db910c4ce79037b2c 100644 (file)
--- a/ceph/src/rocksdb/java/src/main/java/org/rocksdb/TransactionDBOptions.java
+++ b/ceph/src/rocksdb/java/src/main/java/org/rocksdb/TransactionDBOptions.java
@@ -111,7 +111,7 @@ public class TransactionDBOptions extends RocksObject {
   /**
    * The wait timeout in milliseconds when writing a key
    * OUTSIDE of a transaction (ie by calling {@link RocksDB#put},
-   * {@link RocksDB#merge}, {@link RocksDB#remove} or {@link RocksDB#write}
+   * {@link RocksDB#merge}, {@link RocksDB#delete} or {@link RocksDB#write}
    * directly).
    *
    * If 0, no waiting is done if a lock cannot instantly be acquired.
@@ -129,7 +129,7 @@ public class TransactionDBOptions extends RocksObject {
   /**
    * If positive, specifies the wait timeout in milliseconds when writing a key
    * OUTSIDE of a transaction (ie by calling {@link RocksDB#put},
-   * {@link RocksDB#merge}, {@link RocksDB#remove} or {@link RocksDB#write}
+   * {@link RocksDB#merge}, {@link RocksDB#delete} or {@link RocksDB#write}
    * directly).
    *
    * If 0, no waiting is done if a lock cannot instantly be acquired.