summaryrefslogtreecommitdiff
path: root/vendor/github.com/boltdb/bolt
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/github.com/boltdb/bolt')
-rw-r--r--vendor/github.com/boltdb/bolt/README.md19
-rw-r--r--vendor/github.com/boltdb/bolt/db.go4
-rw-r--r--vendor/github.com/boltdb/bolt/tx.go4
3 files changed, 4 insertions, 23 deletions
diff --git a/vendor/github.com/boltdb/bolt/README.md b/vendor/github.com/boltdb/bolt/README.md
index fc2a1e048..7d43a15b2 100644
--- a/vendor/github.com/boltdb/bolt/README.md
+++ b/vendor/github.com/boltdb/bolt/README.md
@@ -21,25 +21,6 @@ consistency and thread safety. Bolt is currently used in high-load production
environments serving databases as large as 1TB. Many companies such as
Shopify and Heroku use Bolt-backed services every day.
-## A message from the author
-
-> The original goal of Bolt was to provide a simple pure Go key/value store and to
-> not bloat the code with extraneous features. To that end, the project has been
-> a success. However, this limited scope also means that the project is complete.
->
-> Maintaining an open source database requires an immense amount of time and energy.
-> Changes to the code can have unintended and sometimes catastrophic effects so
-> even simple changes require hours and hours of careful testing and validation.
->
-> Unfortunately I no longer have the time or energy to continue this work. Bolt is
-> in a stable state and has years of successful production use. As such, I feel that
-> leaving it in its current state is the most prudent course of action.
->
-> If you are interested in using a more featureful version of Bolt, I suggest that
-> you look at the CoreOS fork called [bbolt](https://github.com/coreos/bbolt).
-
-- Ben Johnson ([@benbjohnson](https://twitter.com/benbjohnson))
-
## Table of Contents
- [Getting Started](#getting-started)
diff --git a/vendor/github.com/boltdb/bolt/db.go b/vendor/github.com/boltdb/bolt/db.go
index cc3596fa7..f352ff14f 100644
--- a/vendor/github.com/boltdb/bolt/db.go
+++ b/vendor/github.com/boltdb/bolt/db.go
@@ -737,7 +737,9 @@ retry:
// pass success, or bolt internal errors, to all callers
for _, c := range b.calls {
- c.err <- err
+ if c.err != nil {
+ c.err <- err
+ }
}
break retry
}
diff --git a/vendor/github.com/boltdb/bolt/tx.go b/vendor/github.com/boltdb/bolt/tx.go
index bbb60ac92..6700308a2 100644
--- a/vendor/github.com/boltdb/bolt/tx.go
+++ b/vendor/github.com/boltdb/bolt/tx.go
@@ -291,9 +291,7 @@ func (tx *Tx) close() {
}
// Copy writes the entire database to a writer.
-// This function exists for backwards compatibility.
-//
-// Deprecated; Use WriteTo() instead.
+// This function exists for backwards compatibility. Use WriteTo() instead.
func (tx *Tx) Copy(w io.Writer) error {
_, err := tx.WriteTo(w)
return err