Skip to content
This repository has been archived by the owner on Jan 22, 2020. It is now read-only.

Commit

Permalink
Merge pull request #381 from stellar/update-xdr
Browse files Browse the repository at this point in the history
Update to latest monorepo
  • Loading branch information
nullstyle authored Aug 14, 2017
2 parents 7cd2f4b + a5757f5 commit b578450
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go:
- tip
install:
- go get github.com/constabulary/gb/...
- gb vendor restore
- gb vendor restore -jobs 8
before_script:
- psql -c 'create database "horizon_test";' -U postgres
- psql -c 'create database "stellar-core_test";' -U postgres
Expand Down
2 changes: 1 addition & 1 deletion src/github.com/stellar/horizon/cmd/horizon/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"runtime"

"github.com/PuerkitoBio/throttled"
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/stellar/horizon"
Expand Down
2 changes: 1 addition & 1 deletion src/github.com/stellar/horizon/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package horizon

import (
"github.com/PuerkitoBio/throttled"
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
)

// Config is the configuration for horizon. It get's populated by the
Expand Down
2 changes: 1 addition & 1 deletion src/github.com/stellar/horizon/log/entry.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package log

import (
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
"github.com/stellar/horizon/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions src/github.com/stellar/horizon/log/loggly_hook.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"os"
"time"

"github.com/Sirupsen/logrus"
"github.com/segmentio/go-loggly"
loggly "github.com/segmentio/go-loggly"
"github.com/sirupsen/logrus"
)

// LogglyHook sends logs to loggly
Expand Down
5 changes: 3 additions & 2 deletions src/github.com/stellar/horizon/log/main.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package log

import (
"github.com/Sirupsen/logrus"
"os"

"github.com/go-errors/errors"
"github.com/sirupsen/logrus"
"golang.org/x/net/context"
"os"
// glog "log"
)

Expand Down
2 changes: 1 addition & 1 deletion src/github.com/stellar/horizon/log/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

"golang.org/x/net/context"

"github.com/Sirupsen/logrus"
ge "github.com/go-errors/errors"
"github.com/sirupsen/logrus"
. "github.com/smartystreets/goconvey/convey"
)

Expand Down
4 changes: 2 additions & 2 deletions src/github.com/stellar/horizon/log/metrics_hook.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package log

import (
"github.com/Sirupsen/logrus"
"github.com/rcrowley/go-metrics"
metrics "github.com/rcrowley/go-metrics"
"github.com/sirupsen/logrus"
)

// Metrics is a logrus hook-compliant struct that records metrics about logging
Expand Down
2 changes: 1 addition & 1 deletion src/github.com/stellar/horizon/test/log.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package test

import (
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
"github.com/stellar/horizon/log"
)

Expand Down
2 changes: 1 addition & 1 deletion src/github.com/stellar/horizon/test/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"net/http/httptest"
"testing"

"github.com/Sirupsen/logrus"
"github.com/jmoiron/sqlx"
"github.com/sirupsen/logrus"
hlog "github.com/stellar/horizon/log"
tdb "github.com/stellar/horizon/test/db"
"github.com/stretchr/testify/assert"
Expand Down
14 changes: 7 additions & 7 deletions vendor/manifest
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
"branch": "master"
},
{
"importpath": "github.com/Sirupsen/logrus",
"repository": "https://github.com/Sirupsen/logrus",
"revision": "a283a10442df8dc09befd873fab202bf8a253d6a",
"importpath": "github.com/sirupsen/logrus",
"repository": "https://github.com/sirupsen/logrus",
"revision": "68cec9f21fbf3ea8d8f98c044bc6ce05f17b267a",
"branch": "master"
},
{
"importpath": "github.com/Sirupsen/logrus/hooks/test",
"repository": "https://github.com/Sirupsen/logrus",
"revision": "a283a10442df8dc09befd873fab202bf8a253d6a",
"importpath": "github.com/sirupsen/logrus/hooks/test",
"repository": "https://github.com/sirupsen/logrus",
"revision": "68cec9f21fbf3ea8d8f98c044bc6ce05f17b267a",
"branch": "master",
"path": "/hooks/test"
},
Expand Down Expand Up @@ -418,7 +418,7 @@
{
"importpath": "github.com/stellar/go",
"repository": "https://github.com/stellar/go",
"revision": "79fa0dbbbc5a16ec5c9673929a0cad2ee381e2fe",
"revision": "8ebb9467a2aca25263a485761babb78684ee1bcd",
"branch": "master"
},
{
Expand Down

0 comments on commit b578450

Please sign in to comment.