chore: track lima master now that quote fix is merged (#177)

Issue #, if available: *Description of changes:* - Since the ssh quote fix is merged, we can track Lima's `master` branch again *Testing done:* - [x] I've reviewed the guidance in CONTRIBUTING.md #### License Acceptance By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. Signed-off-by: Justin Alvarez <[email protected]> Signed-off-by: Vishwas Siravara <[email protected]>
runfinch · Oct 14, 2023 · 5bde8a1 · 5bde8a1
1 parent 5ca76ab
commit 5bde8a1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,6 @@
 [submodule "src/lima"]
 	path = src/lima
-	url = https://github.com/pendo324/lima
-	branch = windows-ssh-quoting
+	url = https://github.com/lima-vm/lima
 [submodule "src/socket_vmnet"]
 	path = src/socket_vmnet
 	url = https://github.com/lima-vm/socket_vmnet
diff --git a/src/lima b/src/lima
+1 −1		.github/workflows/test.yml
+0 −3		cmd/limactl/edit.go
+2 −0		cmd/limactl/main.go
+0 −3		cmd/limactl/start.go
+4 −4		examples/alpine.yaml
+4 −4		examples/apptainer-rootful.yaml
+4 −4		examples/apptainer.yaml
+2 −2		examples/archlinux.yaml
+4 −4		examples/buildkit.yaml
+4 −4		examples/centos-stream-8.yaml
+4 −4		examples/centos-stream-9.yaml
+4 −4		examples/default.yaml
+4 −4		examples/docker-rootful.yaml
+4 −4		examples/docker.yaml
+4 −4		examples/experimental/9p.yaml
+2 −2		examples/experimental/armv7l.yaml
+2 −2		examples/experimental/riscv64.yaml
+4 −4		examples/experimental/rke2.yaml
+4 −4		examples/experimental/virtiofs-linux.yaml
+2 −3		examples/experimental/vz.yaml
+4 −4		examples/faasd.yaml
+4 −4		examples/k3s.yaml
+6 −5		examples/k8s.yaml
+4 −4		examples/ubuntu-lts.yaml
+4 −4		examples/ubuntu.yaml
+4 −4		examples/vmnet.yaml
+1 −1		hack/test-port-forwarding.pl
+1 −1		hack/test-templates.sh
+2 −1		pkg/downloader/downloader.go
+2 −1		pkg/hostagent/events/watcher.go
+4 −1		pkg/networks/sudoers.go
+3 −1		pkg/windows/process_windows.go
+5 −0		pkg/wsl2/wsl_driver_windows.go
+3 −0		website/content/en/docs/Config/Mount/_index.md
+2 −2		website/content/en/docs/Config/Network/_index.md
+4 −2		website/content/en/docs/Config/VMType/_index.md
+2 −2		website/content/en/docs/faq/_index.md