barak/cayley
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge master and gaedatastore branch

Browse source
This commit is contained in:
Barak Michener 2015-04-04 19:09:33 -04:00
commit 84718983a5
6 changed files with 476 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
graph/primarykey.go
View file

@ -102,7 +102,7 @@ func (p *PrimaryKey) String() string {
return ""
}
func (p *PrimaryKey) MarshalJSON() ([]byte, error) {
func (p PrimaryKey) MarshalJSON() ([]byte, error) {
switch p.keyType {
case none:
return nil, errors.New("Cannot marshal PrimaryKey with KeyType of 'none'")