Merge branch 'master' of ops:nuevo-pilosa

This commit is contained in:
Todd Gruben 2014-01-16 11:01:32 -06:00
commit 557fd90bb0

View file

@ -6,7 +6,7 @@
},
"etcd": {
"repo": "github.com/coreos/go-etcd/etcd",
"version": "8a4461a",
"version": "35c98e8c885757fab1824daa77cc0e24bf30e76b",
"type": "git"
},
"gkvlite": {