Merge branch '2.1' into develop

This commit is contained in:
Johan Wikman
2017-04-27 09:11:02 +03:00
51 changed files with 2233 additions and 3313 deletions

View File

@ -1,2 +1,3 @@
add_subdirectory(storage_rocksdb)
#Storage RocksDB not built by default.
#add_subdirectory(storage_rocksdb)
add_subdirectory(storage_inmemory)