The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/6053
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
From 2612ddb630edc8498251b9fe0668a5194b4c8845 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Thu, 8 Aug 2019 17:35:49 -0400
Subject: [PATCH 1/3] Makefile: Update Github URLs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
Makefile | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 06a232a943..9e17cd4922 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ deps:
git pull; \
fi; \
else \
- git clone --depth=1 "https://github.com/CanonicalLtd/sqlite";
"$(GOPATH)/deps/sqlite"; \
+ git clone --depth=1 "https://github.com/canonical/sqlite";
"$(GOPATH)/deps/sqlite"; \
git log -1 --format="format:%ci%n" | sed -e 's/ [-+].*$$//;s/
/T/;s/^/D /' > manifest; \
git log -1 --format="format:%H" > manifest.uuid; \
fi
@@ -55,7 +55,7 @@ deps:
git pull; \
fi; \
else \
- git clone --depth=1 "https://github.com/freeekanayaka/libco";
"$(GOPATH)/deps/libco"; \
+ git clone --depth=1 "https://github.com/canonical/libco";
"$(GOPATH)/deps/libco"; \
fi
cd "$(GOPATH)/deps/libco" && \
@@ -68,7 +68,7 @@ deps:
git pull; \
fi; \
else \
- git clone --depth=1 "https://github.com/CanonicalLtd/raft";
"$(GOPATH)/deps/raft"; \
+ git clone --depth=1 "https://github.com/canonical/raft";
"$(GOPATH)/deps/raft"; \
fi
cd "$(GOPATH)/deps/raft" && \
@@ -83,7 +83,7 @@ deps:
git pull; \
fi; \
else \
- git clone --depth=1 "https://github.com/CanonicalLtd/dqlite";
"$(GOPATH)/deps/dqlite"; \
+ git clone --depth=1 "https://github.com/canonical/dqlite";
"$(GOPATH)/deps/dqlite"; \
fi
cd "$(GOPATH)/deps/dqlite" && \
@@ -149,10 +149,10 @@ dist:
# Download the cluster-enabled sqlite/dqlite
mkdir $(TMP)/_dist/deps/
- git clone --depth=1 https://github.com/CanonicalLtd/dqlite
$(TMP)/_dist/deps/dqlite
- git clone --depth=1 https://github.com/CanonicalLtd/sqlite
$(TMP)/_dist/deps/sqlite
- git clone --depth=1 https://github.com/freeekanayaka/libco
$(TMP)/_dist/deps/libco
- git clone --depth=1 https://github.com/CanonicalLtd/raft
$(TMP)/_dist/deps/raft
+ git clone --depth=1 https://github.com/canonical/dqlite
$(TMP)/_dist/deps/dqlite
+ git clone --depth=1 https://github.com/canonical/sqlite
$(TMP)/_dist/deps/sqlite
+ git clone --depth=1 https://github.com/canonical/libco
$(TMP)/_dist/deps/libco
+ git clone --depth=1 https://github.com/canonical/raft
$(TMP)/_dist/deps/raft
cd $(TMP)/_dist/deps/sqlite && git log -1 --format="format:%ci%n" | sed
-e 's/ [-+].*$$//;s/ /T/;s/^/D /' > manifest
cd $(TMP)/_dist/deps/sqlite && git log -1 --format="format:%H" >
manifest.uuid
From 147f67f3b32203878989fdf3302e6890785a83c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Thu, 8 Aug 2019 17:36:05 -0400
Subject: [PATCH 2/3] doc: Update Github URLs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
doc/database.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/database.md b/doc/database.md
index 4626663aac..1630e0bee9 100644
--- a/doc/database.md
+++ b/doc/database.md
@@ -23,7 +23,7 @@ with a pretty simple query.
## Database engine
Since LXD supports clustering, and all members of the cluster must share the
same database state, the database engine is based on a [distributed
-version](https://github.com/CanonicalLtd/dqlite) of SQLite, which provides
+version](https://github.com/canonical/dqlite) of SQLite, which provides
replication, fault-tolerance and automatic failover without the need of
external
database processes. We refer to this database as the "global" LXD database.
From 80838f0cd15edf219c0fcbe1e2b5d8bedc9d9a89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Thu, 8 Aug 2019 17:49:26 -0400
Subject: [PATCH 3/3] lxd: Update Github URLs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
lxd/api_cluster.go | 2 +-
lxd/cluster/gateway.go | 2 +-
lxd/cluster/gateway_test.go | 2 +-
lxd/cluster/heartbeat_test.go | 2 +-
lxd/cluster/membership.go | 2 +-
lxd/cluster/membership_test.go | 2 +-
lxd/cluster/migrate_test.go | 2 +-
lxd/cluster/raft.go | 2 +-
lxd/cluster/raft_test.go | 2 +-
lxd/daemon.go | 2 +-
lxd/db/cluster/open.go | 2 +-
lxd/db/db.go | 2 +-
lxd/db/testing.go | 2 +-
lxd/response.go | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/lxd/api_cluster.go b/lxd/api_cluster.go
index 5a879ce319..21c133c40a 100644
--- a/lxd/api_cluster.go
+++ b/lxd/api_cluster.go
@@ -12,7 +12,7 @@ import (
"strings"
"time"
- "github.com/CanonicalLtd/go-dqlite"
+ "github.com/canonical/go-dqlite"
"github.com/gorilla/mux"
lxd "github.com/lxc/lxd/client"
"github.com/lxc/lxd/lxd/cluster"
diff --git a/lxd/cluster/gateway.go b/lxd/cluster/gateway.go
index a96999c7fe..226413afc7 100644
--- a/lxd/cluster/gateway.go
+++ b/lxd/cluster/gateway.go
@@ -16,7 +16,7 @@ import (
"sync"
"time"
- dqlite "github.com/CanonicalLtd/go-dqlite"
+ dqlite "github.com/canonical/go-dqlite"
"github.com/lxc/lxd/lxd/db"
"github.com/lxc/lxd/lxd/util"
"github.com/lxc/lxd/shared"
diff --git a/lxd/cluster/gateway_test.go b/lxd/cluster/gateway_test.go
index 85ef10c505..7cc26541f6 100644
--- a/lxd/cluster/gateway_test.go
+++ b/lxd/cluster/gateway_test.go
@@ -11,7 +11,7 @@ import (
"path/filepath"
"testing"
- dqlite "github.com/CanonicalLtd/go-dqlite"
+ dqlite "github.com/canonical/go-dqlite"
"github.com/lxc/lxd/lxd/cluster"
"github.com/lxc/lxd/lxd/db"
"github.com/lxc/lxd/shared"
diff --git a/lxd/cluster/heartbeat_test.go b/lxd/cluster/heartbeat_test.go
index 79c5d92758..cbfc1b1640 100644
--- a/lxd/cluster/heartbeat_test.go
+++ b/lxd/cluster/heartbeat_test.go
@@ -7,7 +7,7 @@ import (
"testing"
"time"
- dqlite "github.com/CanonicalLtd/go-dqlite"
+ dqlite "github.com/canonical/go-dqlite"
"github.com/lxc/lxd/lxd/cluster"
"github.com/lxc/lxd/lxd/db"
"github.com/lxc/lxd/lxd/state"
diff --git a/lxd/cluster/membership.go b/lxd/cluster/membership.go
index 8a1b186c1f..56f65498f2 100644
--- a/lxd/cluster/membership.go
+++ b/lxd/cluster/membership.go
@@ -8,7 +8,7 @@ import (
"strconv"
"time"
- dqlite "github.com/CanonicalLtd/go-dqlite"
+ dqlite "github.com/canonical/go-dqlite"
"github.com/lxc/lxd/lxd/db"
"github.com/lxc/lxd/lxd/db/cluster"
"github.com/lxc/lxd/lxd/node"
diff --git a/lxd/cluster/membership_test.go b/lxd/cluster/membership_test.go
index c65a526b64..6c3aff3f40 100644
--- a/lxd/cluster/membership_test.go
+++ b/lxd/cluster/membership_test.go
@@ -8,7 +8,7 @@ import (
"testing"
"time"
- dqlite "github.com/CanonicalLtd/go-dqlite"
+ dqlite "github.com/canonical/go-dqlite"
"github.com/lxc/lxd/lxd/cluster"
"github.com/lxc/lxd/lxd/db"
"github.com/lxc/lxd/lxd/state"
diff --git a/lxd/cluster/migrate_test.go b/lxd/cluster/migrate_test.go
index 4f205eb610..1fd5ed9fb8 100644
--- a/lxd/cluster/migrate_test.go
+++ b/lxd/cluster/migrate_test.go
@@ -8,7 +8,7 @@ import (
"os"
"testing"
- dqlite "github.com/CanonicalLtd/go-dqlite"
+ dqlite "github.com/canonical/go-dqlite"
"github.com/lxc/lxd/lxd/cluster"
"github.com/lxc/lxd/shared"
"github.com/stretchr/testify/assert"
diff --git a/lxd/cluster/raft.go b/lxd/cluster/raft.go
index 7ee808d914..3abaa866cc 100644
--- a/lxd/cluster/raft.go
+++ b/lxd/cluster/raft.go
@@ -5,7 +5,7 @@ import (
"os"
"path/filepath"
- dqlite "github.com/CanonicalLtd/go-dqlite"
+ dqlite "github.com/canonical/go-dqlite"
"github.com/lxc/lxd/lxd/db"
"github.com/lxc/lxd/lxd/node"
"github.com/lxc/lxd/shared"
diff --git a/lxd/cluster/raft_test.go b/lxd/cluster/raft_test.go
index 0952831791..622a9bf814 100644
--- a/lxd/cluster/raft_test.go
+++ b/lxd/cluster/raft_test.go
@@ -5,7 +5,7 @@ import (
"net/http/httptest"
"testing"
- dqlite "github.com/CanonicalLtd/go-dqlite"
+ dqlite "github.com/canonical/go-dqlite"
"github.com/lxc/lxd/lxd/cluster"
"github.com/lxc/lxd/lxd/db"
"github.com/lxc/lxd/lxd/util"
diff --git a/lxd/daemon.go b/lxd/daemon.go
index 2b85c5ea02..64b2abb3de 100644
--- a/lxd/daemon.go
+++ b/lxd/daemon.go
@@ -17,7 +17,7 @@ import (
"time"
"github.com/CanonicalLtd/candidclient"
- dqlite "github.com/CanonicalLtd/go-dqlite"
+ dqlite "github.com/canonical/go-dqlite"
"github.com/gorilla/mux"
"github.com/pkg/errors"
"golang.org/x/sys/unix"
diff --git a/lxd/db/cluster/open.go b/lxd/db/cluster/open.go
index 78acd44369..7d0aef3c25 100644
--- a/lxd/db/cluster/open.go
+++ b/lxd/db/cluster/open.go
@@ -6,7 +6,7 @@ import (
"path/filepath"
"sync/atomic"
- "github.com/CanonicalLtd/go-dqlite"
+ "github.com/canonical/go-dqlite"
"github.com/lxc/lxd/lxd/db/query"
"github.com/lxc/lxd/lxd/db/schema"
"github.com/lxc/lxd/lxd/util"
diff --git a/lxd/db/db.go b/lxd/db/db.go
index 704ed7f704..b6633aafd6 100644
--- a/lxd/db/db.go
+++ b/lxd/db/db.go
@@ -6,7 +6,7 @@ import (
"sync"
"time"
- dqlite "github.com/CanonicalLtd/go-dqlite"
+ dqlite "github.com/canonical/go-dqlite"
"github.com/pkg/errors"
"github.com/lxc/lxd/lxd/db/cluster"
diff --git a/lxd/db/testing.go b/lxd/db/testing.go
index 8d652faf24..cee1366481 100644
--- a/lxd/db/testing.go
+++ b/lxd/db/testing.go
@@ -9,7 +9,7 @@ import (
"testing"
"time"
- dqlite "github.com/CanonicalLtd/go-dqlite"
+ dqlite "github.com/canonical/go-dqlite"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/lxd/response.go b/lxd/response.go
index 973782a614..8e77e8d402 100644
--- a/lxd/response.go
+++ b/lxd/response.go
@@ -11,7 +11,7 @@ import (
"os"
"time"
- dqlite "github.com/CanonicalLtd/go-dqlite"
+ dqlite "github.com/canonical/go-dqlite"
"github.com/mattn/go-sqlite3"
"github.com/pkg/errors"
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
