From be03f915bbd7094195b9172fe6f0e424e79e4ad9 Mon Sep 17 00:00:00 2001 From: "Gerasimos (Makis) Maropoulos" Date: Wed, 11 Oct 2017 01:21:54 +0300 Subject: [PATCH] vendor the sessions/sessiondb/badger database // The Iris' vendored badger it's self-vendored as well. // Why? // Because they were changing their public API a lot and iris was unable to built itself... // https://github.com/dgraph-io/badger/pull/256 // https://github.com/dgraph-io/badger/pull/254 // https://github.com/dgraph-io/badger/pull/261 // I fixed everything by pushing a PR(the original's repository tests were failing) from the kataras/badger to the dgraph-io/badger: // https://github.com/dgraph-io/badger/pull/264 // But it's better to have it on its own folder for the shake of stability, // Iris should be not affected of any third-party changes, // this method guards against upstream renames and deletes. Former-commit-id: 56e796cc96ac93024c1c53905ae9a78b81b37230 --- Gopkg.lock | 12 +++++++++--- Gopkg.toml | 6 +++++- middleware/i18n/i18n.go | 5 +++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 8de5cfea..537ab7e1 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -15,9 +15,9 @@ [[projects]] branch = "master" - name = "github.com/Unknwon/i18n" + name = "github.com/iris-contrib/i18n" packages = ["."] - revision = "8372b908b5876d26cfa46a85fc4851b981dad102" + revision = "976ad7f3463c8f0b8fd949cf5e78a73a1828c96d" [[projects]] name = "github.com/ajg/form" @@ -37,6 +37,12 @@ revision = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8" version = "v1.3.1" +[[projects]] + branch = "master" + name = "github.com/dgraph-io/badger" + packages = ["."] + revision = "d8b951787ebe5c42286475df8a3dea25045bda1a" + [[projects]] name = "github.com/davecgh/go-spew" packages = ["spew"] @@ -101,7 +107,7 @@ branch = "master" name = "github.com/iris-contrib/formBinder" packages = ["."] - revision = "ed52a69d2bfbe92c9e8c5a35cad28da183ededdc" + revision = "ad9fb86c356f971f30319c40ddbdcf72129a2791" [[projects]] branch = "master" diff --git a/Gopkg.toml b/Gopkg.toml index e5a8564e..cb4afc49 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -8,7 +8,7 @@ [[constraint]] branch = "master" - name = "github.com/Unknwon/i18n" + name = "github.com/iris-contrib/i18n" [[constraint]] branch = "master" @@ -18,6 +18,10 @@ branch = "master" name = "github.com/boltdb/bolt" +[[constraint]] + branch = "master" + name = "github.com/dgraph-io/badger" + [[constraint]] branch = "master" name = "github.com/eknkc/amber" diff --git a/middleware/i18n/i18n.go b/middleware/i18n/i18n.go index 4c6d8c7a..6e5a9dd7 100644 --- a/middleware/i18n/i18n.go +++ b/middleware/i18n/i18n.go @@ -1,11 +1,12 @@ -// Package i18n provides internalization and localization via middleware. See _examples/miscellaneous/i18n +// Package i18n provides internalization and localization via middleware. +// See _examples/miscellaneous/i18n package i18n import ( "reflect" "strings" - "github.com/Unknwon/i18n" + "github.com/iris-contrib/i18n" "github.com/kataras/iris/context" )