From 1f1abb17e24a137196e1b49aaa19f549bf401e34 Mon Sep 17 00:00:00 2001 From: Soputtra San Date: Mon, 19 Oct 2015 23:43:11 +1100 Subject: [PATCH 1/3] Fix import path --- modules/setting/setting_memcache.go | 2 +- modules/setting/setting_redis.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/setting/setting_memcache.go b/modules/setting/setting_memcache.go index 26b1cc6f6..9a7653b72 100644 --- a/modules/setting/setting_memcache.go +++ b/modules/setting/setting_memcache.go @@ -7,7 +7,7 @@ package setting import ( - _ "github.com/macaron-contrib/cache/memcache" + _ "github.com/go-macaron/cache/memcache" ) func init() { diff --git a/modules/setting/setting_redis.go b/modules/setting/setting_redis.go index bfd1694de..e12010cd5 100644 --- a/modules/setting/setting_redis.go +++ b/modules/setting/setting_redis.go @@ -7,8 +7,8 @@ package setting import ( - _ "github.com/macaron-contrib/cache/redis" - _ "github.com/macaron-contrib/session/redis" + _ "github.com/go-macaron/cache/redis" + _ "github.com/go-macaron/session/redis" ) func init() { From 87c05c386f779aad585d0af6092b66968ad3a9a1 Mon Sep 17 00:00:00 2001 From: Matthias Pioch Date: Tue, 20 Oct 2015 23:13:06 +0200 Subject: [PATCH 2/3] fix import path, fix #1795 --- .gopmfile | 1 + 1 file changed, 1 insertion(+) diff --git a/.gopmfile b/.gopmfile index 2ed63d896..2cae07dca 100644 --- a/.gopmfile +++ b/.gopmfile @@ -24,6 +24,7 @@ github.com/go-macaron/i18n = github.com/go-macaron/session = github.com/go-macaron/toolbox = github.com/klauspost/compress = +github.com/klauspost/crc32 = github.com/mattn/go-sqlite3 = commit:b808f01f66 github.com/mcuadros/go-version = commit:d52711f8d6 github.com/microcosm-cc/bluemonday = commit:85ba47ef2c From 0f4f81f1fb5fb7e1d9c16cafa89df1baad47e2c1 Mon Sep 17 00:00:00 2001 From: Matthias Pioch Date: Wed, 21 Oct 2015 09:00:35 +0200 Subject: [PATCH 3/3] fix import path on x64 systems, fix #1795 --- .gopmfile | 1 + 1 file changed, 1 insertion(+) diff --git a/.gopmfile b/.gopmfile index 2cae07dca..6a2959b86 100644 --- a/.gopmfile +++ b/.gopmfile @@ -25,6 +25,7 @@ github.com/go-macaron/session = github.com/go-macaron/toolbox = github.com/klauspost/compress = github.com/klauspost/crc32 = +github.com/klauspost/cpuid = github.com/mattn/go-sqlite3 = commit:b808f01f66 github.com/mcuadros/go-version = commit:d52711f8d6 github.com/microcosm-cc/bluemonday = commit:85ba47ef2c