)]}'
{
  "commit": "3b7d067647eca9458aca829d4aee39d36f36ab18",
  "tree": "cebee9729ac04710264a433c49e9aa66434f4573",
  "parents": [
    "e7b6e76f96e89740c3464769d1cc34780b61f19e",
    "25fd0ef636d25b8505cd9e6e29d8f87b7b5432af"
  ],
  "author": {
    "name": "Ibrahim Jarif",
    "email": "ibrahim@dgraph.io",
    "time": "Wed Jul 08 13:19:26 2020"
  },
  "committer": {
    "name": "GitHub",
    "email": "noreply@github.com",
    "time": "Wed Jul 08 13:19:26 2020"
  },
  "message": "Update dgraph-maintenance branch\n\nThis PR adds the following changes from **Master branch to the dgraph-maintenance branch**.\r\n```\r\n25fd0ef Update ristretto to commit f66de99 (#1391)\r\nfac972f Update head while replaying value log (#1372)\r\ne5fd05a Rework DB.DropPrefix (#1381)\r\nadeb842 Fix assert in background compression and encryption. (#1366)\r\n```\r\n\r\nThe **master and dgraph-maintenace branch** have following difference \r\n`+`  (in green) means commit missing on dgraph-maintenance\r\n `-` (in red) means the commit exists.\r\n```diff\r\n+ 079f5aeb6ce42d2794c3b34f0d81aa9bc129659e DefaultOptions: Set KeepL0InMemory to false (#1345)\r\n+ 7e19cacc7fe92a91c631880bb4d1e53c01a5770c Add immudb to the project list (#1341)\r\n+ da80eb9697e2448a3d8bf64dc7ead32542c4f608 Iterator: Always add key to txn.reads (#1328)\r\n+ a7e239ef780b07194fe3786aed64e128f9881682 StreamWriter: Close head writer (#1347)\r\n+ 543f3530cd70651cb72970b0c4fe3eca454814be Fix build on golang tip (#1355)\r\n+ fd8989493b52f39957e89ff3a7679bc45ea92674 Compaction: Expired keys and delete markers are never purged (#1354)\r\n+ 056d859606380082d8694d2ad3b3ebf4b10318d7 Support disabling conflict detection (#1344)\r\n+ b76283248541a3b6a8e135be418b4495b9ec3f73 Tests: Do not leave behind state goroutines (#1349)\r\n+ b2267c2088c3681eb3407c7650b2856991ce47e8 Restore: Account for value size as well (#1358)\r\n+ 14386ac9b764cb6655cb0da7c848e244369a2a27 GC: Consider size of value while rewriting (#1357)\r\n+ c45d966681d4a058df1190b10f1b5f60c9ab0b6d Fix assert in background compression and encryption. (#1366)\r\n+ dd332b04e6e7fe06e4f213e16025128b1989c491 Avoid panic in filltables() (#1365)\r\n+ 3f4761d229515a0208d847b6635011ed5187f75f Force KeepL0InMemory to be true when InMemory is true (#1375)\r\n+ d37ce36911ae349fbedba342f693184aa434cc30 Tests: Use t.Parallel in TestIteratePrefix tests  (#1377)\r\n+ 158d9271e1052082d6377ffa56483650129b726c Remove second initialization of writech in Open (#1382)\r\n+ 675efcdfd28807be3ebce92141b3b0eb4bc40ae6 Increase default valueThreshold from 32B to 1KB (#1346)\r\n+ 3042e377679844d1a8acdd3671f07425c9ff4a44 pre allocate cache key for the block cache and the bloom filter cache (#1371)\r\n+ e013bfd25899ec014d7117fa6e94b17a114d9921 Rework DB.DropPrefix (#1381)\r\n+ 509de73a8ad1c1b8ea62ffc0cef944716435ec25 Update head while replaying value log (#1372)\r\n+ 09dfa663bbc3d84655d3b3a617416273a8e0b385 Update ristretto to commit f66de99 (#1391)\r\n+ 717b89c860d00e010053ed10e56b2b9d8bdab1b6 Enable cross-compiled 32bit tests on TravisCI (#1392)\r\n```\r\n\r\n\u003c!-- Reviewable:start --\u003e\r\n---\r\nThis change is [\u003cimg src\u003d\"https://reviewable.io/review_button.svg\" height\u003d\"34\" align\u003d\"absmiddle\" alt\u003d\"Reviewable\"/\u003e](https://reviewable.io/reviews/dgraph-io/badger/1398)\r\n\u003c!-- Reviewable:end --\u003e\r\n",
  "tree_diff": []
}