Merge pull request #607 from harshavardhana/pr_out_bump_gocyclo_back_to_16

Makefile

@@ -29,7 +29,7 @@ lint:
 
 cyclo:
 	@echo "Running $@:"
-	@test -z "$$(gocyclo -over 18 . | grep -v Godeps/_workspace/src/ | tee /dev/stderr)"
+	@test -z "$$(gocyclo -over 16 . | grep -v Godeps/_workspace/src/ | tee /dev/stderr)"
 
 pre-build:
 	@echo "Running pre-build:"

pkg/storage/donut/donut.go

@@ -38,6 +38,10 @@ const (
 	// bucket, object metadata
 	bucketMetadataConfig = "bucketMetadata.json"
 	objectMetadataConfig = "objectMetadata.json"
+
+	// versions
+	objectMetadataVersion      = "1.0"
+	donutObjectMetadataVersion = "1.0"
 )
 
 // attachDonutNode - wrapper function to instantiate a new node for associated donut

pkg/storage/donut/donut_bucket.go

@@ -149,8 +149,8 @@ func (b bucket) PutObject(objectName string, objectData io.Reader, expectedMD5Su
 	summer := md5.New()
 	objectMetadata := make(map[string]string)
 	donutObjectMetadata := make(map[string]string)
-	objectMetadata["version"] = "1.0"
-	donutObjectMetadata["version"] = "1.0"
+	objectMetadata["version"] = objectMetadataVersion
+	donutObjectMetadata["version"] = donutObjectMetadataVersion
 	size := metadata["contentLength"]
 	sizeInt, err := strconv.ParseInt(size, 10, 64)
 	if err != nil {