transitioned ipfs2 -> ipfs

cmd/ipfs/.gitignore renamed

cmd/ipfs/Makefile renamed

cmd/ipfs/README.md renamed

cmd/ipfs/daemon.go renamed

+2 -2

@@ -10,8 +10,8 @@ import (

10 cmds "github.com/jbenet/go-ipfs/commands"

11 cmdsHttp "github.com/jbenet/go-ipfs/commands/http"

12 core "github.com/jbenet/go-ipfs/core"

13 - commands "github.com/jbenet/go-ipfs/core/commands2"

14 - daemon "github.com/jbenet/go-ipfs/daemon2"

13 + commands "github.com/jbenet/go-ipfs/core/commands"

14 + daemon "github.com/jbenet/go-ipfs/core/daemon"

15 util "github.com/jbenet/go-ipfs/util"

16 "github.com/jbenet/go-ipfs/util/debugerror"

17 )

cmd/ipfs/equinox.yaml renamed

cmd/ipfs/init.go renamed

cmd/ipfs/ipfs.go renamed

+1 -1

@@ -4,7 +4,7 @@ import (

4 "fmt"

5

6 cmds "github.com/jbenet/go-ipfs/commands"

7 - commands "github.com/jbenet/go-ipfs/core/commands2"

7 + commands "github.com/jbenet/go-ipfs/core/commands"

8 )

9

10 // This is the CLI root, used for executing commands accessible to CLI clients.

cmd/ipfs/ipfsHandler.go renamed

cmd/ipfs/main.go renamed

+1 -1

@@ -19,7 +19,7 @@ import (

19 cmdsHttp "github.com/jbenet/go-ipfs/commands/http"

20 config "github.com/jbenet/go-ipfs/config"

21 core "github.com/jbenet/go-ipfs/core"

22 - daemon "github.com/jbenet/go-ipfs/daemon2"

22 + daemon "github.com/jbenet/go-ipfs/core/daemon"

23 updates "github.com/jbenet/go-ipfs/updates"

24 u "github.com/jbenet/go-ipfs/util"

25 "github.com/jbenet/go-ipfs/util/debugerror"

cmd/ipfs/main_test.go renamed

cmd/ipfs/tour.go renamed

cmd/ipfs/tour_test.go renamed

core/commands/add.go renamed

core/commands/block.go renamed

core/commands/bootstrap.go renamed

core/commands/cat.go renamed

core/commands/commands.go renamed

core/commands/config.go renamed

core/commands/diag.go renamed

core/commands/diag_test.go renamed

core/commands/id.go renamed

core/commands/internal/slice_util.go renamed

core/commands/log.go renamed

core/commands/ls.go renamed

core/commands/mount_darwin.go renamed

core/commands/mount_unix.go renamed

core/commands/mount_windows.go renamed

core/commands/name.go renamed

core/commands/object.go renamed

core/commands/pin.go renamed

core/commands/publish.go renamed

core/commands/refs.go renamed

core/commands/resolve.go renamed

core/commands/root.go renamed

core/commands/swarm.go renamed

core/commands/update.go renamed

core/commands/version.go renamed

core/daemon/daemon.go renamed