release/v1.0: Vendor in latest badger with nil pointer dereference fi…

…x. (#3348)

* Vendor in latest badger with nil pointer dereference fix.

* Revert "Vendor in latest badger with nil pointer dereference fix."

This reverts commit 84960d3.

* Run govendor fetch for badger and its subpackages.

* Update watermark init args.

conn/node.go

@@ -148,7 +148,7 @@ func NewNode(rc *pb.RaftContext, store *raftwal.DiskStorage) *Node {
 		peers:       make(map[uint64]string),
 		requestCh:   make(chan linReadReq, 100),
 	}
-	n.Applied.Init()
+	n.Applied.Init(nil)
 	// This should match up to the Applied index set above.
 	n.Applied.SetDoneUntil(n.Cfg.Applied)
 	glog.Infof("Setting raft.Config to: %+v\n", n.Cfg)

dgraph/cmd/zero/oracle.go

@@ -60,7 +60,7 @@ func (o *Oracle) Init() {
 	o.keyCommit = make(map[string]uint64)
 	o.subscribers = make(map[int]chan *pb.OracleDelta)
 	o.updates = make(chan *pb.OracleDelta, 100000) // Keeping 1 second worth of updates.
-	o.doneUntil.Init()
+	o.doneUntil.Init(nil)
 	go o.sendDeltasToSubscribers()
 }