Commit graph

4401 commits

Author SHA1 Message Date
Jeff Mitchell 6723ac91cf changelog++ 2016-07-22 18:02:08 -04:00
Jeff Mitchell e7d5b4a7e5 Merge pull request #1646 from maier/master
Circonus integration for telemetry metrics
2016-07-22 18:00:15 -04:00
Jeff Mitchell 4ab60f36a3 Rename err var to be more clear 2016-07-22 16:57:47 -04:00
matt maier 6519c224ac Circonus integration for telemetry metrics 2016-07-22 15:49:23 -04:00
Vishal Nayak 1e56223c49 Merge pull request #1645 from hashicorp/update-init-docs
Update docs on the `init` command
2016-07-22 11:32:27 -04:00
vishalnayak a7665723e3 Address review feedback 2016-07-22 11:31:55 -04:00
vishalnayak f53792efc7 Update docs on the init command 2016-07-22 11:22:10 -04:00
Jeff Mitchell f1cc16b77f Remove manual selection of nextprotos from tls config coming from certutil; it's really not up to us to dictate third party requirements 2016-07-22 11:12:46 -04:00
Jeff Mitchell df8e4fe746 Have Travis use go 1.7rc3 for testing 2016-07-22 10:59:19 -04:00
vishalnayak 6d82a8f5df changelog++ 2016-07-22 10:28:15 -04:00
Vishal Nayak 78459f5d1e Merge pull request #1643 from hashicorp/additional-service-tags
Added `service-tags` config option to Consul storage backend
2016-07-22 10:22:07 -04:00
vishalnayak 8dc3a830dc Address review feedback 2016-07-22 10:21:45 -04:00
vishalnayak 32a72e84dc Added test for service tags 2016-07-22 09:04:42 -04:00
vishalnayak 58bd985551 Address review feedback from @jefferai 2016-07-22 08:44:16 -04:00
vishalnayak 9bfb518e3f Make debug statements specify that the logs are for physical/consul 2016-07-22 07:03:14 -04:00
vishalnayak 248889dd1b Fix broken test 2016-07-22 06:42:56 -04:00
vishalnayak 765d131b47 Added service-tags config option to provide additional tags to registered service 2016-07-22 04:41:48 -04:00
vishalnayak e4e2eec14b changelog++ 2016-07-21 20:50:08 -04:00
Vishal Nayak caab9d40f2 Merge pull request #1642 from hashicorp/init-service-discovery
Add service discovery to init command
2016-07-21 20:47:32 -04:00
vishalnayak b243ee256e Address review feedback by @jefferai 2016-07-21 20:46:31 -04:00
vishalnayak bd8ff10462 Address review feedback from @sean 2016-07-21 19:04:43 -04:00
vishalnayak 5316082675 Added documentation for init service discovery 2016-07-21 17:27:56 -04:00
vishalnayak f557457909 Added a separate flag consul-service to receive Consul service name 2016-07-21 16:51:38 -04:00
vishalnayak 23800c5f1d Add service discovery to init command 2016-07-21 16:17:29 -04:00
Jeff Mitchell 3e7449164c Update website text 2016-07-21 14:54:24 -04:00
Jeff Mitchell 6d41045b3b Update website description 2016-07-21 14:32:23 -04:00
Vishal Nayak 9bb89431dc Merge pull request #1632 from hashicorp/lib-locks-create
Added helper to create locks
2016-07-21 10:23:34 -04:00
Jeff Mitchell a57a23c12b changelog++ 2016-07-21 10:23:11 -04:00
Jeff Mitchell e13ed0289e changelog++ 2016-07-21 10:22:20 -04:00
Jeff Mitchell 4d8f3a89c6 Merge pull request #1639 from hashicorp/issue-1637
Fix panic if no certificates are supplied by client
2016-07-21 10:21:55 -04:00
Jeff Mitchell 68dcf677fa Fix panic if no certificates are supplied by client
Fixes #1637
2016-07-21 10:20:41 -04:00
Jeff Mitchell b353e44209 Fix build 2016-07-21 09:53:41 -04:00
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