Merge branch 'master' of github.com:facebook/rocksdb into T7916298

db/db_table_properties_test.cc

@@ -188,7 +188,7 @@ TEST_F(DBTablePropertiesTest, GetPropertiesOfTablesInRange) {
     // create a bunch of ranges
     std::vector<std::string> random_keys;
     auto n = 2 * rnd.Uniform(50);
-    for (uint i = 0; i < n; ++i) {
+    for (uint32_t i = 0; i < n; ++i) {
       random_keys.push_back(test::RandomKey(&rnd, 5));
     }
 

include/rocksdb/utilities/transaction.h

@@ -214,10 +214,6 @@ class Transaction {
   //
   // The returned iterator is only valid until Commit(), Rollback(), or
   // RollbackToSavePoint() is called.
-  // NOTE: Transaction::Put/Merge/Delete will currently invalidate this iterator
-  // until
-  // the following issue is fixed:
-  // https://github.com/facebook/rocksdb/issues/616
   virtual Iterator* GetIterator(const ReadOptions& read_options) = 0;
 
   virtual Iterator* GetIterator(const ReadOptions& read_options,