mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2024-01-19 02:48:24 +00:00
Merge branch 'master' into messaging
This commit is contained in:
commit
f5a76f67c1
|
@ -2,9 +2,10 @@ package filer
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
|
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
|
||||||
"github.com/chrislusf/seaweedfs/weed/wdclient"
|
"github.com/chrislusf/seaweedfs/weed/wdclient"
|
||||||
"time"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func ReadEntry(masterClient *wdclient.MasterClient, filerClient filer_pb.SeaweedFilerClient, dir, name string, byteBuffer *bytes.Buffer) error {
|
func ReadEntry(masterClient *wdclient.MasterClient, filerClient filer_pb.SeaweedFilerClient, dir, name string, byteBuffer *bytes.Buffer) error {
|
||||||
|
@ -60,7 +61,7 @@ func SaveInsideFiler(client filer_pb.SeaweedFilerClient, dir, name string, conte
|
||||||
},
|
},
|
||||||
Content: content,
|
Content: content,
|
||||||
},
|
},
|
||||||
SkipCheckParentDirectory: true,
|
SkipCheckParentDirectory: false,
|
||||||
})
|
})
|
||||||
} else if err == nil {
|
} else if err == nil {
|
||||||
entry := resp.Entry
|
entry := resp.Entry
|
||||||
|
|
Loading…
Reference in a new issue