status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
4,257 Commits 445 Branches 179 Tags 481 MiB
Commit Graph

4257 Commits

Author SHA1 Message Date
James Phillips d045611045 Update CHANGELOG.md 2016-07-22 10:42:17 -07:00
shalev67 f66bf3114a Added api agent docs enableTagOverride var 2016-07-22 20:21:07 +03:00
James Phillips fce7d75609 Merge pull request #2201 from jhmartin/patch-3 
Escape verify_server_hostname angle-brackets
 2016-07-20 16:08:20 -07:00
Jason Martin a1b38ececb
Escape verify_server_hostname angle-brackets 2016-07-20 15:57:07 -07:00
James Phillips 49424aefa0 Merge pull request #2199 from hashicorp/f-stats 
Adds consul info data into /v1/agent/self endpoint.
 2016-07-20 15:18:24 -07:00
James Phillips bd5e5bf19c Adds consul info data into /v1/agent/self endpoint. 2016-07-20 15:12:26 -07:00
James Phillips 95a6263a3b Merge pull request #2197 from maier/master 
Documentation update
 2016-07-20 08:50:12 -07:00
matt maier 5d020e72ed Change circonus_broker_search_tag to circonus_broker_select_tag to match same change to command/agent/config.go 2016-07-20 11:44:38 -04:00
James Phillips bcd08aa0ce Merge pull request #2196 from hashicorp/b-print-version 
Fixes startup version print to show the human version.
 2016-07-20 09:09:46 -06:00
James Phillips 2087772297 Fixes startup version print to show the human version. 2016-07-20 08:09:05 -07:00
James Phillips 8a8271fd81 Merge pull request #2195 from hashicorp/b-fix-version 
Adds version info back into the config.
 2016-07-19 18:41:42 -07:00
James Phillips e137f4dafd Adds version info back into the config. 
In #2191 I accedentally broke SCADA by not populating the agent's version
information into the config structure. This adds it back, and makes the
distinction between the raw parts we send to APIs and the human form of
the version that we display.
 2016-07-19 18:38:15 -07:00
James Phillips 83bc68a784 Update CHANGELOG.md 2016-07-19 17:17:11 -07:00
James Phillips cfbe8f430e Merge pull request #2193 from hashicorp/pr-2188-slackpad 
Adds Circonus support for telemetry metrics.
 2016-07-19 17:15:29 -07:00
James Phillips dd06007766 Adds a vendoring cheat sheet. 2016-07-19 17:14:25 -07:00
James Phillips 2f3e346dc1 Updates armon/go-metrics and adds Circonus vendored libraries. 2016-07-19 16:54:21 -07:00
James Phillips 129db848c7 Tweaks the docs a bit. 2016-07-19 15:54:52 -07:00
James Phillips 500ea080d2 Removes top-level key support for Circonus configs. 
This was a feature to help migrate to the new telemetry sub-structure,
but since this is all new we don't need it.
 2016-07-19 15:46:57 -07:00
James Phillips eedccc4ca0 Merge pull request #2192 from hashicorp/f-short-sha 
Switches to the short form of the SHA for the build info.
 2016-07-19 15:20:12 -07:00
James Phillips e96eedd9e2 Switches to the short form of the SHA for the build info. 2016-07-19 15:19:32 -07:00
James Phillips 40e433358e Simplifies the version formatter. 2016-07-19 15:15:26 -07:00
James Phillips d982af63fd Update CHANGELOG.md 2016-07-19 15:11:07 -07:00
James Phillips f6bb8e379a Merge pull request #2191 from hashicorp/f-version-tweak 
Makes sure version is always displayed consistently.
 2016-07-19 15:08:23 -07:00
James Phillips b32731d09f Makes sure version is always displayed consistently. 2016-07-19 15:06:32 -07:00
James Phillips 3b398272fc Merge pull request #2185 from richard-hulm/issue-1404 
Add the version (from config) to the Starting Consul Agent printout
 2016-07-19 13:56:53 -07:00
James Phillips e24a3482d6 Merge pull request #2190 from DynomiteDB/master 
Unnest TaggedAddresses in Catalog Register endpoint
 2016-07-19 12:08:38 -07:00
akbarahmed 79dd717f41 Merge remote-tracking branch 'upstream/master' 2016-07-19 11:01:55 -07:00
akbarahmed 591f6ca3ef Unnest TaggedAddresses. Add sentence to mention that multiple Checks may 
be specified as an array. Closes hashicorp/consul#2176
 2016-07-19 10:55:46 -07:00
richard.hulm e2f7e825a1 RH: Add revision (if it exists) 2016-07-19 10:04:56 +01:00
matt maier 1b6dd97864 Documentation for Circonus Telemetry integration 2016-07-18 16:24:49 -04:00
matt maier f4525d2582 fix: typo coupled, default token app to "consul", switch submit_interval/SubmitInterval to submission_interval/SubmissionInterval 2016-07-18 15:46:11 -04:00
matt maier fb76256c26 Add Circonus support for Telemetry metrics 2016-07-18 09:34:43 -04:00
richard.hulm 25eeab5e49 Add the version (from config) to the Starting Consul Agent printout 2016-07-18 10:01:16 +01:00
James Phillips 548fb6eb3f Merge pull request #2183 from stusmall/master 
Fixing minor punctuation mistake.
 2016-07-14 00:22:25 -06:00
Stu Small 450d3dbe91 Fixing minor punctuation mistake. 2016-07-13 16:50:19 -06:00
Evan Gilman 95126e4ddf
Merge branch 'master' into let-watches-be-stale 
Attempt to let the tests pass
 2016-07-13 11:20:44 -07:00
James Phillips 2e2edb3304 Merge pull request #2182 from dcarbone/dcarbone-lib-addition 
Adding my lib to list of downloads
 2016-07-13 10:31:35 -06:00
Daniel Carbone 7dc0687903 Adding my lib to list of downloads 2016-07-13 08:28:44 -05:00
James Phillips 38949860de Update CHANGELOG.md 2016-07-11 17:37:57 -06:00
James Phillips c635afd055 Merge pull request #2178 from hashicorp/f-rpc-test 
Adds some supplemental tests for RPC "no leader" retries.
 2016-07-11 17:34:48 -06:00
James Phillips 0ba13505ba Adds some supplemental tests for RPC "no leader" retries. 
This adds some extra tests for #2175.
 2016-07-11 17:32:26 -06:00
James Phillips c6ef1d8ac0 Merge pull request #2175 from hashicorp/f-hold-rpc 
Gracefully handle short lived outages by holding RPC calls
 2016-07-11 16:43:11 -06:00
Armon Dadgar 86a63eeda8 consul: change tests to not expect ErrNoLeader 2016-07-10 13:24:18 -04:00
Armon Dadgar be7893082c consul: Refactor forward to hold RPC when no leader is known 2016-07-10 13:24:06 -04:00
Armon Dadgar 26ca78936c consul: Add RPCHoldTimeout as tunable hold period 2016-07-10 13:23:43 -04:00
James Phillips 64e3033d3c Merge pull request #2144 from janisz/add_marathon-consul 
Added allegor/marathon-consul in community tools
 2016-07-06 10:54:05 -07:00
James Phillips f3841d5509 Merge pull request #2159 from myENA/website/consul-backinator 
Add link to consul-backinator utility
 2016-07-06 10:50:49 -07:00
Ryan Uber 104e1a5cf6 Merge pull request #1837 from cleung2010/obfuscate-acl-token 
Obfuscate token for lookupACL error
 2016-07-05 13:56:49 -07:00
Ryan Uber 3db6395597 Merge pull request #1836 from shaneog/terraform-google 
Add Terraform config for Google Cloud Platform
 2016-07-05 13:55:16 -07:00
Shane O'Grady 6e27651968 Add Terraform config for Google Cloud Platform 
Supports:
- Ubuntu 14.04 LTS
- RHEL 6
- RHEL 7
- CentOS 6
- CentOS 7
 2016-07-05 17:11:52 -03:00