Merge branch 'master' into nexter
Conflicts: graph/leveldb/all_iterator.go graph/leveldb/iterator.go graph/memstore/triplestore.go query/gremlin/finals.go
This commit is contained in:
commit
62785d25c2
37 changed files with 882 additions and 467 deletions
|
|
@ -117,7 +117,7 @@ func (it *AllIterator) Next() bool {
|
|||
it.Close()
|
||||
return false
|
||||
}
|
||||
it.result = out
|
||||
it.result = Token(out)
|
||||
return true
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue