Merge pull request #72 from rockset/Merge-6.5.2

Merge RocksDB 6.5.2 into RocksDB Cloud

Author: igorcanadi

.gitignore

@@ -24,6 +24,7 @@ make_config.mk
 *.vcxproj.filters
 *.sln
 *.cmake
+.watchmanconfig
 CMakeCache.txt
 CMakeFiles/
 build/
@@ -32,6 +33,8 @@ ldb
 manifest_dump
 sst_dump
 blob_dump
+block_cache_trace_analyzer
+tools/block_cache_analyzer/*.pyc
 column_aware_encoding_exp
 util/build_version.cc
 build_tools/VALGRIND_LOGS/
@@ -47,6 +50,8 @@ rocksdb_undump
 db_test2
 trace_analyzer
 trace_analyzer_test
+block_cache_trace_analyzer
+.DS_Store
 
 java/out
 java/target

.travis.yml

@@ -5,6 +5,9 @@ os:
 - linux
 compiler:
   - gcc
+osx_image: xcode8.3
+jdk:
+  - openjdk7
 cache:
   directories:
   - "$BUILD_DIR/aws"

.watchmanconfig

@@ -0,0 +1,6 @@
+{
+  "content_hash_warming": true,
+  "content_hash_max_items": 333333,
+  "hint_num_files_per_dir": 8,
+  "fsevents_latency": 0.05
+}