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

4675 Commits

Author SHA1 Message Date
James Phillips 4dc8bb1426
Merge branch 'master' of github.com:hashicorp/consul 2016-11-22 17:50:03 -08:00
James Phillips a5baa091c8
Runs `go fmt`. 2016-11-22 17:49:48 -08:00
James Phillips 58cd5ddc20 Update CHANGELOG.md 2016-11-22 17:49:14 -08:00
James Phillips dd31e47eef
Updates static assets to pick up #2340 and and #2525. 2016-11-22 17:47:50 -08:00
James Phillips 098864dd8b Merge pull request #2525 from hashicorp/jbs-2485 
Bootstrap w/o Glyphicon Halflings (resolves #2485)
 2016-11-22 17:44:41 -08:00
Kyle Havlovitz 8ab7ed901f Update CHANGELOG.md 2016-11-22 20:28:08 -05:00
Kyle Havlovitz 9d6851d9a6 Update CHANGELOG.md 2016-11-22 20:20:53 -05:00
Kyle Havlovitz dcdadd012f Fix keyring doc method wording 2016-11-22 20:10:43 -05:00
Kyle Havlovitz 6bd65c668b Combine keyring endpoints into one 2016-11-22 20:10:43 -05:00
Kyle Havlovitz 31453c7dbd Add version specific note to keyring http docs 2016-11-22 20:10:43 -05:00
Kyle Havlovitz 345e2366eb Add keyring api website doc sections 2016-11-22 20:10:43 -05:00
Kyle Havlovitz dd3368c19e Add keyring http endpoints 2016-11-22 20:10:43 -05:00
James Phillips 4ed6770cfa Makes addresses blank in service definition. 2016-11-22 08:29:29 -08:00
Brian Shumate 967b777d2a
Bootstrap w/o Glyphicons (resolves #2485) 
- Remove reference to Glyphicon Halflings @fontface
- Remove unused Glphyicon related classes
 2016-11-21 18:08:17 -05:00
James Phillips bd9a841038 Merge pull request #2523 from hashicorp/jbs-2153 
Update demo
 2016-11-21 09:55:18 -08:00
Brian Shumate f85812d7cc
Update demo 
- Add DEMO_BOX_NAME env var for specifing different boxes (#2153)
- Update default box to debian/jessie64
- Update README
 2016-11-21 12:49:59 -05:00
James Phillips ea58d6795d Tweaks title of snapshot link. 2016-11-21 09:02:19 -08:00
James Phillips fb27534dc1 Merge pull request #2515 from hashicorp/f-snapshot-agent-docs 
Adds a draft of the snapshot agent docs.
 2016-11-20 22:42:22 -08:00
James Phillips 66b61e68a0
Adds details about config files. 2016-11-20 22:41:33 -08:00
James Phillips 3a63638cd7
Tweaks local option name. 2016-11-19 18:23:37 -08:00
James Phillips 460bf5f71e Merge pull request #2520 from hashicorp/jbs-2393 
Attempt to describe entire response (for #2393)
 2016-11-18 08:04:36 -08:00
Brian Shumate 940232890e
tweaks 2016-11-18 10:53:59 -05:00
Brian Shumate 3871c4810e
Attempt to describe entire response (for #2393) 
Describe fields returned by /v1/catalog/service/<service>
 2016-11-18 10:33:37 -05:00
James Phillips 0cdc11c390 Update CHANGELOG.md 2016-11-17 22:45:56 -08:00
James Phillips 761833cd67 Merge pull request #2518 from hashicorp/f-pretty 
Defaults to pretty JSON in dev mode.
 2016-11-17 22:44:54 -08:00
James Phillips fa680bded7
Defaults to pretty JSON in dev mode. 2016-11-17 22:31:19 -08:00
James Phillips bb54e74adf Update CHANGELOG.md 2016-11-17 17:11:18 -08:00
James Phillips dabb08de51 Merge pull request #2504 from tolitius/envoy 
[website]: adding a Clojure client
 2016-11-17 16:56:38 -08:00
James Phillips 5ce301d322 Merge pull request #2501 from Drawaes/master 
[Website] Update community tools page to add condenserdotnet
 2016-11-17 16:55:39 -08:00
James Phillips 695c128f1b Tweaks markup on community page. 2016-11-17 16:55:27 -08:00
James Phillips 70ad430fd2 Merge pull request #2397 from sdinakar85/patch-1 
Multiple Datacenter Documentation
 2016-11-17 16:43:55 -08:00
James Phillips 5f796f8128 Tweaks formatting of example JSON. 2016-11-17 16:43:47 -08:00
James Phillips 6ce295e0de Merge pull request #2366 from aksentyev/master 
api client: CatalogService added fields CreateIndex, ModifyIndex
 2016-11-17 16:38:39 -08:00
James Phillips ad25acaf6a Moves index fields to the bottom of the structure. 2016-11-17 16:38:30 -08:00
James Phillips c798e32d20 Merge pull request #2340 from kushniro/b-ui-tags-commas 
UI: remove redundant commas in tags list (services view)
 2016-11-17 16:36:15 -08:00
James Phillips 9a81d402b7
Adds notes field to API. 
Closes #2336.
 2016-11-17 16:33:50 -08:00
James Phillips 953286b213
Tweaks DO example Terraform. 2016-11-17 16:27:48 -08:00
James Phillips 2dcbfa1643 Merge pull request #2326 from greenbrian/master 
Add Terraform config for Digital Ocean
 2016-11-17 16:23:10 -08:00
James Phillips c744792fc4 Merge pull request #2238 from hasyimibhar/master 
Remove duplicated environment variables
 2016-11-17 16:18:02 -08:00
James Phillips e1e43dec7a
Adds a draft of the snapshot agent docs. 2016-11-16 21:38:02 -08:00
Cameron Stokes 74cfcd3014 ~ docs: Typo in agent options page. 2016-11-16 07:58:24 -08:00
James Phillips 597166a054 Merge pull request #2510 from BenjaminFarley/master 
Update to operator docs/comments
 2016-11-16 07:24:33 -08:00
Benjamin Farley b78cf3de1f Operator docs update 2016-11-16 09:04:37 +00:00
Benjamin Farley 58fa50e06d Small change to how operator docs read 2016-11-16 09:01:51 +00:00
James Phillips 8ef76ec851 Merge pull request #2508 from hashicorp/f-s3 
Adds AWS S3 SDK.
 2016-11-14 17:59:54 -08:00
James Phillips 4ebbf2b788
Adds AWS S3 SDK. 
This isn't used in OSS but CE needs it. It'll be easier to manage common deps
in OSS and take them to CE.
 2016-11-14 17:56:47 -08:00
James Phillips 2433d2532b Cleans up vendor metadata. (#2507) 
* Removes bad "context" dep.

* Updates Raft checksum.

* Cleans up go-msgpack vendoring.

* Cleans up EC2 vendor entry.
 2016-11-14 17:44:08 -08:00
James Phillips fce54ce3e2
Cleans up EC2 vendor entry. 2016-11-14 17:41:58 -08:00
James Phillips aa6e59dc9a
Cleans up go-msgpack vendoring. 2016-11-14 17:37:05 -08:00
James Phillips 6ca7111977
Updates Raft checksum. 2016-11-14 17:35:01 -08:00