Browse Source

Merge pull request #809 from chrislusf/switching_to_seaweedfs_fuse

switching_to_seaweedfs_fuse
pull/815/head
Chris Lu 6 years ago
committed by GitHub
parent
commit
259a2c111e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      weed/command/mount.go
  2. 4
      weed/command/mount_std.go
  3. 4
      weed/filesys/dir.go
  4. 4
      weed/filesys/dir_link.go
  5. 4
      weed/filesys/dir_rename.go
  6. 4
      weed/filesys/file.go
  7. 4
      weed/filesys/filehandle.go
  8. 4
      weed/filesys/wfs.go
  9. 2
      weed/glide.lock
  10. 2
      weed/glide.yaml

2
weed/command/mount.go

@ -51,7 +51,7 @@ var cmdMount = &Command{
2) have a "weed filer" running 2) have a "weed filer" running
These 2 requirements can be achieved with one command "weed server -filer=true" These 2 requirements can be achieved with one command "weed server -filer=true"
This uses bazil.org/fuse, which enables writing FUSE file systems on
This uses github.com/seaweedfs/fuse, which enables writing FUSE file systems on
Linux, and OS X. Linux, and OS X.
On OS X, it requires OSXFUSE (http://osxfuse.github.com/). On OS X, it requires OSXFUSE (http://osxfuse.github.com/).

4
weed/command/mount_std.go

@ -11,8 +11,8 @@ import (
"strings" "strings"
"time" "time"
"bazil.org/fuse"
"bazil.org/fuse/fs"
"github.com/seaweedfs/fuse"
"github.com/seaweedfs/fuse/fs"
"github.com/chrislusf/seaweedfs/weed/filesys" "github.com/chrislusf/seaweedfs/weed/filesys"
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/util" "github.com/chrislusf/seaweedfs/weed/util"

4
weed/filesys/dir.go

@ -7,8 +7,8 @@ import (
"path/filepath" "path/filepath"
"time" "time"
"bazil.org/fuse"
"bazil.org/fuse/fs"
"github.com/seaweedfs/fuse"
"github.com/seaweedfs/fuse/fs"
"github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb"

4
weed/filesys/dir_link.go

@ -6,8 +6,8 @@ import (
"syscall" "syscall"
"time" "time"
"bazil.org/fuse"
"bazil.org/fuse/fs"
"github.com/seaweedfs/fuse"
"github.com/seaweedfs/fuse/fs"
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
) )

4
weed/filesys/dir_rename.go

@ -1,8 +1,8 @@
package filesys package filesys
import ( import (
"bazil.org/fuse"
"bazil.org/fuse/fs"
"github.com/seaweedfs/fuse"
"github.com/seaweedfs/fuse/fs"
"context" "context"
"math" "math"
"path/filepath" "path/filepath"

4
weed/filesys/file.go

@ -1,8 +1,8 @@
package filesys package filesys
import ( import (
"bazil.org/fuse"
"bazil.org/fuse/fs"
"github.com/seaweedfs/fuse"
"github.com/seaweedfs/fuse/fs"
"context" "context"
"github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"

4
weed/filesys/filehandle.go

@ -1,8 +1,8 @@
package filesys package filesys
import ( import (
"bazil.org/fuse"
"bazil.org/fuse/fs"
"github.com/seaweedfs/fuse"
"github.com/seaweedfs/fuse/fs"
"context" "context"
"fmt" "fmt"
"github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/filer2"

4
weed/filesys/wfs.go

@ -8,8 +8,8 @@ import (
"sync" "sync"
"time" "time"
"bazil.org/fuse"
"bazil.org/fuse/fs"
"github.com/seaweedfs/fuse"
"github.com/seaweedfs/fuse/fs"
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/util" "github.com/chrislusf/seaweedfs/weed/util"

2
weed/glide.lock

@ -1,7 +1,7 @@
hash: 2e3a065472829938d25e879451b6d1aa43e55270e1166a9c044803ef8a3b9eb1 hash: 2e3a065472829938d25e879451b6d1aa43e55270e1166a9c044803ef8a3b9eb1
updated: 2018-06-28T22:01:35.910567-07:00 updated: 2018-06-28T22:01:35.910567-07:00
imports: imports:
- name: bazil.org/fuse
- name: github.com/seaweedfs/fuse
version: 65cc252bf6691cb3c7014bcb2c8dc29de91e3a7e version: 65cc252bf6691cb3c7014bcb2c8dc29de91e3a7e
subpackages: subpackages:
- fs - fs

2
weed/glide.yaml

@ -1,6 +1,6 @@
package: github.com/chrislusf/seaweedfs/weed package: github.com/chrislusf/seaweedfs/weed
import: import:
- package: bazil.org/fuse
- package: github.com/seaweedfs/fuse
subpackages: subpackages:
- fs - fs
- package: github.com/boltdb/bolt - package: github.com/boltdb/bolt

Loading…
Cancel
Save