diff options
| author | Chris Lu <chris.lu@gmail.com> | 2015-02-07 15:35:28 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2015-02-07 15:35:28 -0800 |
| commit | f7998f86522ef04717e22bb094f00138bdf18748 (patch) | |
| tree | 5d8454179564d52feae0ad78caa2648518f63eb8 /go/operation/data_struts.go | |
| parent | 714ccb6e2b709355bed617947ccaa6ad4b68b77b (diff) | |
| download | seaweedfs-f7998f86522ef04717e22bb094f00138bdf18748.tar.xz seaweedfs-f7998f86522ef04717e22bb094f00138bdf18748.zip | |
merge conflicts
Diffstat (limited to 'go/operation/data_struts.go')
| -rw-r--r-- | go/operation/data_struts.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/go/operation/data_struts.go b/go/operation/data_struts.go index 4980f9913..bfc53aa50 100644 --- a/go/operation/data_struts.go +++ b/go/operation/data_struts.go @@ -2,5 +2,6 @@ package operation type JoinResult struct { VolumeSizeLimit uint64 `json:"VolumeSizeLimit,omitempty"` + SecretKey string `json:"secretKey,omitempty"` Error string `json:"error,omitempty"` } |