Merging changes from master

This commit is contained in:
vishalnayak
2015-08-12 09:28:16 -07:00
54 changed files with 2959 additions and 66 deletions

View File

@@ -17,6 +17,7 @@ import (
"github.com/hashicorp/vault/builtin/logical/aws"
"github.com/hashicorp/vault/builtin/logical/cassandra"
"github.com/hashicorp/vault/builtin/logical/consul"
"github.com/hashicorp/vault/builtin/logical/jwt"
"github.com/hashicorp/vault/builtin/logical/mysql"
"github.com/hashicorp/vault/builtin/logical/pki"
"github.com/hashicorp/vault/builtin/logical/postgresql"
@@ -75,6 +76,7 @@ func Commands(metaPtr *command.Meta) map[string]cli.CommandFactory {
"transit": transit.Factory,
"mysql": mysql.Factory,
"ssh": ssh.Factory,
"jwt": jwt.Factory,
},
ShutdownCh: makeShutdownCh(),
}, nil