From d66ede7186bdcd0e70e3a375f306596322180adf Mon Sep 17 00:00:00 2001
From: Yicheng Qin <qycqycqycqycqyc@gmail.com>
Date: Thu, 13 Aug 2015 11:32:45 -0700
Subject: [PATCH] godeps: bump capnslog to
 42a8c3b1a6f917bb8346ef738f32712a7ca0ede7

---
 Godeps/Godeps.json                            |  4 +--
 .../github.com/coreos/pkg/capnslog/init.go    |  2 ++
 .../coreos/pkg/capnslog/init_windows.go       | 25 +++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 Godeps/_workspace/src/github.com/coreos/pkg/capnslog/init_windows.go

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index b9a6917c1..8d609f3f7 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,6 +1,6 @@
 {
 	"ImportPath": "github.com/coreos/etcd",
-	"GoVersion": "go1.4.1",
+	"GoVersion": "go1.4.2",
 	"Packages": [
 		"./..."
 	],
@@ -53,7 +53,7 @@
 		},
 		{
 			"ImportPath": "github.com/coreos/pkg/capnslog",
-			"Rev": "6b7d4a60e79f6aa57a27591288f28e1dcd47a3bc"
+			"Rev": "42a8c3b1a6f917bb8346ef738f32712a7ca0ede7"
 		},
 		{
 			"ImportPath": "github.com/gogo/protobuf/proto",
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/init.go b/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/init.go
index 64fce961e..44b8cd361 100644
--- a/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/init.go
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/init.go
@@ -11,6 +11,8 @@
 // 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.
+//
+// +build !windows
 
 package capnslog
 
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/init_windows.go b/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/init_windows.go
new file mode 100644
index 000000000..a98bd6679
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/init_windows.go
@@ -0,0 +1,25 @@
+// Copyright 2015 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 capnslog
+
+import "os"
+
+func init() {
+	initHijack()
+
+	// Go `log` pacakge uses os.Stderr.
+	SetFormatter(NewPrettyFormatter(os.Stderr, false))
+	SetGlobalLogLevel(INFO)
+}