From 152dcdd04d4110252299d38f114a59dc33d650c3 Mon Sep 17 00:00:00 2001
From: Alexander Kolbasov <akolbasov@intermodaldata.com>
Date: Mon, 4 Jan 2016 13:52:05 -0800
Subject: [PATCH] storage/backend: disable MAP_POPULATE on Solaris

---
 storage/backend/boltoption_solaris.go | 19 +++++++++++++++++++
 storage/backend/boltoption_unix.go    |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 storage/backend/boltoption_solaris.go

diff --git a/storage/backend/boltoption_solaris.go b/storage/backend/boltoption_solaris.go
new file mode 100644
index 000000000..a88061a59
--- /dev/null
+++ b/storage/backend/boltoption_solaris.go
@@ -0,0 +1,19 @@
+// Copyright 2016 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package backend
+
+import "github.com/coreos/etcd/Godeps/_workspace/src/github.com/boltdb/bolt"
+
+var boltOpenOptions *bolt.Options = nil
diff --git a/storage/backend/boltoption_unix.go b/storage/backend/boltoption_unix.go
index bd676a524..b20a71312 100644
--- a/storage/backend/boltoption_unix.go
+++ b/storage/backend/boltoption_unix.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build linux solaris
+// +build linux
 
 package backend