From 8caef610b2548273d48ace696d3a90ba0b510d66 Mon Sep 17 00:00:00 2001 From: Bryan Matsuo Date: Fri, 25 Apr 2014 03:23:05 -0600 Subject: [PATCH 1/2] update AUTHORS Docker-DCO-1.1-Signed-off-by: Bryan Matsuo (github: bmatsuo) --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 6e34065266..8fb76c057e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -44,6 +44,7 @@ Brian Olsen Brian Shumate Briehan Lombaard Bruno Bigras +Bryan Matsuo Caleb Spare Calen Pennington Carl X. Su From 99284a24e76bf52582e5b70ad28b6371bd4f4b42 Mon Sep 17 00:00:00 2001 From: Bryan Matsuo Date: Fri, 25 Apr 2014 03:11:32 -0600 Subject: [PATCH 2/2] FIXES #5398: pkg/graphdb build only dependent on cgo tag Docker-DCO-1.1-Signed-off-by: Bryan Matsuo (github: bmatsuo) --- pkg/graphdb/conn_sqlite3.go | 2 +- pkg/graphdb/conn_unsupported.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/graphdb/conn_sqlite3.go b/pkg/graphdb/conn_sqlite3.go index 5b5f8e6bfc..33355ae4dc 100644 --- a/pkg/graphdb/conn_sqlite3.go +++ b/pkg/graphdb/conn_sqlite3.go @@ -1,4 +1,4 @@ -// +build linux,amd64 freebsd,cgo +// +build cgo package graphdb diff --git a/pkg/graphdb/conn_unsupported.go b/pkg/graphdb/conn_unsupported.go index 0a48634336..3895051661 100644 --- a/pkg/graphdb/conn_unsupported.go +++ b/pkg/graphdb/conn_unsupported.go @@ -1,4 +1,4 @@ -// +build !linux,!freebsd linux,!amd64 freebsd,!cgo +// +build !cgo package graphdb