Merge branch 'master' into gql (d7ea1829) · Commits · Mirror / dgraph · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

dgraph
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

d7ea1829

Commit d7ea1829 authored 8 years ago by Manish R Jain

Downloads
- Plain Diff

Merge branch 'master' into gql

parents 337b2fce c364b15b

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

client/go/main.go 4 additions, 4 deletions

client/go/main.go
query/graph/graphresponse.pb.go 177 additions, 0 deletions

query/graph/graphresponse.pb.go
query/graph/graphresponse.proto 25 additions, 0 deletions

query/graph/graphresponse.proto
query/pb/graphresponse.proto 0 additions, 25 deletions

query/pb/graphresponse.proto
query/query.go 101 additions, 52 deletions

query/query.go
query/query_test.go 54 additions, 25 deletions

query/query_test.go
server/main.go 11 additions, 7 deletions

server/main.go

with 372 additions and 113 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment