Merge remote-tracking branch 'origin/master' into HEAD

Conflicts:
	pkg/drivers/donut/donut.go
	pkg/storage/donut/bucket.go
	pkg/storage/donut/donut.go
	pkg/storage/donut/donut_test.go
	pkg/storage/donut/donutdriver.go

pkg/storage/donut/bucket.go

@@ -0,0 +1,37 @@
+package donut
+
+import (
+	"errors"
+	"strconv"
+	"strings"
+)
+
+type donutBucket struct {
+	nodes   []string
+	objects map[string][]byte
+}
+
+// GetNodes - get list of associated nodes for a given bucket
+func (b donutBucket) GetNodes() ([]string, error) {
+	var nodes []string
+	for _, node := range b.nodes {
+		nodes = append(nodes, node)
+	}
+	return nodes, nil
+}
+
+func (b donutBucket) AddNode(nodeID, bucketID string) error {
+	tokens := strings.Split(bucketID, ":")
+	if len(tokens) != 3 {
+		return errors.New("Bucket ID malformed: " + bucketID)
+	}
+	// bucketName := tokens[0]
+	// aggregate := tokens[1]
+	// aggregate := "0"
+	part, err := strconv.Atoi(tokens[2])
+	if err != nil {
+		return errors.New("Part malformed: " + tokens[2])
+	}
+	b.nodes[part] = nodeID
+	return nil
+}