Merge branch 'master' into pkcs8

CHANGELOG.md

@@ -121,7 +121,7 @@ generate them, leading to client errors.
 MISC:
 
  * Various documentation fixes and improvements [GH-685] [GH-688] [GH-697]
-   [GH-710] [GH-715]
+   [GH-710] [GH-715] [GH-831]
 
 ## 0.3.1 (October 6, 2015)
 

api/SPEC.md

@@ -87,7 +87,7 @@ The following HTTP status codes are used throughout the API.
 - `200` - Success with data.
 - `204` - Success, no data returned.
 - `400` - Invalid request, missing or invalid data.
-- `401` - Unauthorized, your authentication details are either
+- `403` - Forbidden, your authentication details are either
    incorrect or you don't have access to this feature.
 - `404` - Invalid path. This can both mean that the path truly
    doesn't exist or that you don't have permission to view a

helper/certutil/certutil_test.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"log"
 	"strings"
 	"testing"
 
@@ -158,7 +157,6 @@ func compareCertBundleToParsedCertBundle(cbut *CertBundle, pcbut *ParsedCertBund
 			return fmt.Errorf("Bundle has wrong private key type")
 		}
 		if cb.PrivateKey != privRSAKeyPem && cb.PrivateKey != privRSA8KeyPem {
-			log.Println(cb.PrivateKey, privRSAKeyPem, privRSA8KeyPem)
 			return fmt.Errorf("Bundle private key does not match")
 		}
 	case "ec":

scripts/dist.sh

@@ -14,6 +14,11 @@ if ([ -z $AWS_ACCESS_KEY_ID ] || [ -z $AWS_SECRET_ACCESS_KEY ]) && [ ! -z $HC_RE
     exit 1
 fi
 
+if [ -z $NOBUILD ] && [ -z $DOCKER_CROSS_IMAGE ]; then
+    echo "Please set the Docker cross-compile image in DOCKER_CROSS_IMAGE"
+    exit 1
+fi
+
 # Get the parent directory of where this script is.
 SOURCE="${BASH_SOURCE[0]}"
 while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done

website/config.rb

@@ -2,7 +2,7 @@ set :base_url, "https://www.vaultproject.io/"
 
 activate :hashicorp do |h|
   h.name         = "vault"
-  h.version      = "0.3.1"
+  h.version      = "0.4.0"
   h.github_slug  = "hashicorp/vault"
   h.website_root = "website"
 

website/source/docs/http/index.html.md

@@ -133,7 +133,7 @@ The following HTTP status codes are used throughout the API.
 - `204` - Success, no data returned.
 - `400` - Invalid request, missing or invalid data. See the
    "validation" section for more details on the error response.
-- `401` - Unauthorized, your authentication details are either
+- `403` - Forbidden, your authentication details are either
    incorrect or you don't have access to this feature.
 - `404` - Invalid path. This can both mean that the path truly
    doesn't exist or that you don't have permission to view a