Commit graph

4116 commits

Author SHA1 Message Date
Jeff Mitchell 70e3508c5e changelog++ 2016-07-21 09:52:48 -04:00
Jeff Mitchell a0471bb8bb Merge pull request #1638 from hashicorp/issue-1637
Ensure we never return a nil set of trusted CA certs
2016-07-21 09:51:15 -04:00
Jeff Mitchell d335038b40 Ensure we never return a nil set of trusted CA certs
Fixes #1637
2016-07-21 09:50:31 -04:00
Laura Bennett eaa35df2d9 Merge pull request #1636 from hashicorp/changelog-branch
changelog++
2016-07-20 17:15:08 -04:00
Laura Bennett 3d6bc7e8be changelog++ 2016-07-20 16:52:08 -04:00
Laura Bennett 4186856f74 Merge branch 'master' of https://github.com/hashicorp/vault 2016-07-20 16:39:55 -04:00
Jeff Mitchell 86cdfe8ab7 changelog++ 2016-07-20 15:56:57 -04:00
Laura Bennett 1be9cd9444 Merge branch 'master' of https://github.com/hashicorp/vault 2016-07-20 15:46:13 -04:00
Laura Bennett 559b0a5006 Merge pull request #1635 from hashicorp/mysql-idle-conns
Added maximum idle connections to mysql to close hashicorp/vault#1616
2016-07-20 15:31:37 -04:00
Laura Bennett baaab17dda Merge branch 'master' of https://github.com/hashicorp/vault 2016-07-20 14:47:43 -04:00
Laura Bennett 422dcc8f25 minor formatting edits 2016-07-20 14:42:52 -04:00
Jeff Mitchell b558c35943 Set defaults to handle upgrade cases.
Ping #1604
2016-07-20 14:07:19 -04:00
Jeff Mitchell 9a30d818b9 changelog++ 2016-07-20 14:04:23 -04:00
Jeff Mitchell f2b6569b0b Merge pull request #1604 from memory/mysql-displayname-2
concat role name and token displayname to form mysql username
2016-07-20 14:02:17 -04:00
Jeff Mitchell fcd39b9628 changelog++ 2016-07-20 13:58:49 -04:00
Jeff Mitchell 3ec81debe7 Trim leading/trailing space around PEM bundles.
Fixes #1634
2016-07-20 13:57:49 -04:00
Nathan J. Mehl ea294f1d27 use both role name and token display name to form mysql username 2016-07-20 10:17:00 -07:00
Laura Bennett dba466f50e update documentation for idle connections 2016-07-20 12:50:07 -04:00
Laura Bennett e6bf4fa489 whitespace error corrected 2016-07-20 12:00:05 -04:00
Laura Bennett 991ab7f953 Merge branch 'master' of https://github.com/hashicorp/vault 2016-07-20 11:56:01 -04:00
Jeff Mitchell f9fc509dca changelog++ 2016-07-20 10:51:04 -04:00
Nathan J. Mehl 0483457ad2 respond to feedback from @vishalnayak
- split out usernameLength and displaynameLength truncation values,
  as they are different things

- fetch username and displayname lengths from the role, not from
  the request parameters

- add appropriate defaults for username and displayname lengths
2016-07-20 06:36:51 -07:00
Laura Bennett 7cdb8a28bc max_idle_connections added 2016-07-20 09:26:26 -04:00
vishalnayak 648410b1b3 changelog++ 2016-07-19 14:21:09 -04:00
Laura Bennett 03c7eb7d18 initial commit before rebase to stay current with master 2016-07-19 14:18:37 -04:00
Vishal Nayak 57a8e4d3a2 Merge pull request #1628 from hashicorp/fix-consul-registrations
Fixed re-registrations and health-check flatenning issue
2016-07-19 14:18:15 -04:00
vishalnayak 6872df833a Uniquify the check ID 2016-07-19 14:17:50 -04:00
vishalnayak f54dc7a31e Set QueryOptions while fetching service information from Consul catalog 2016-07-19 14:07:06 -04:00
Jeff Mitchell 49194847da Add mongodb to sidebar 2016-07-19 14:00:47 -04:00
Jeff Mitchell efe29d2cb4 changelog++ 2016-07-19 13:57:16 -04:00
Jeff Mitchell 30ca541f99 Merge pull request #1414 from mhurne/mongodb-secret-backend
Add mongodb secret backend
2016-07-19 13:56:15 -04:00
Jeff Mitchell 3334b22993 Some minor linting 2016-07-19 13:54:18 -04:00
Matt Hurne 0f9ee8fbed Merge branch 'master' into mongodb-secret-backend 2016-07-19 12:47:58 -04:00
Matt Hurne 11a3cb67d0 mongodb secret backend documentation: Remove verify_connection from example response to GET /mongodb/config/connection; add documentation for GET /mongodb/config/lease 2016-07-19 12:46:54 -04:00
Matt Hurne 072c5bc915 mongodb secret backend: Remove redundant type declarations 2016-07-19 12:35:14 -04:00
Matt Hurne c7d42cb112 mongodb secret backend: Fix broken tests, clean up unused parameters 2016-07-19 12:26:23 -04:00
vishalnayak a0c6dcd4d8 changelog++ 2016-07-19 12:25:07 -04:00
Jeff Mitchell f627320ca8 Merge pull request #1630 from hashicorp/human-friendly-duration
Have human-oriented token duration and secret duration output display…
2016-07-19 12:21:43 -04:00
Vishal Nayak fbb04349b5 Merge pull request #1629 from hashicorp/remove-verify-connection
Remove unused VerifyConnection from storage entries of SQL backends
2016-07-19 12:21:23 -04:00
Jeff Mitchell 9d68297ffa Have human-oriented token duration and secret duration output display a more human-friendly format 2016-07-19 12:15:00 -04:00
Vishal Nayak 8a1bb1626a Merge pull request #1583 from hashicorp/ssh-allowed-roles
Add allowed_roles to ssh-helper-config and return role name from verify call
2016-07-19 12:04:12 -04:00
vishalnayak 7fb04a1bbd Remove unused VerifyConnection from storage entries of SQL backends 2016-07-19 11:55:49 -04:00
Matt Hurne 316837857b mongodb secret backend: Return lease ttl and max_ttl in lease read in seconds rather than as duration strings 2016-07-19 11:23:56 -04:00
Matt Hurne f18d98272d mongodb secret backend: Don't bother persisting verify_connection field in connection config 2016-07-19 11:20:45 -04:00
Matt Hurne f8e6bcbb69 mongodb secret backend: Handle cases where stored username or db is not a string as expected when revoking credentials 2016-07-19 11:18:00 -04:00
Matt Hurne 75a5fbd8fe Merge branch 'master' into mongodb-secret-backend 2016-07-19 10:38:45 -04:00
vishalnayak 11e6fe0fb4 Fix tests 2016-07-19 07:58:47 -04:00
vishalnayak ac7ecbce5c Fixed re-registrations and health-check flatenning issue 2016-07-19 07:06:41 -04:00
Jeff Mitchell 321207a19c changelog++ 2016-07-18 22:04:44 -04:00
Jeff Mitchell aaca99ff73 Merge pull request #1627 from hashicorp/rollback-nil-race
Ensure mount/auth tables are not nil when triggering rollback
2016-07-18 22:03:38 -04:00