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

2796 Commits

Author SHA1 Message Date
Armon Dadgar 981c62ccba command/lock: Check for shutdown during lock acquisition. Fixes #800 2015-07-22 16:07:44 -07:00
Armon Dadgar cfa7ed71a7 Merge pull request #1080 from zendesk/master 
Return every time lock acquisition fails
 2015-07-22 15:30:46 -07:00
Armon Dadgar 3e9e575dee Merge pull request #1127 from carlpett/master 
Fix missing config-dir in getting started guide
 2015-07-22 12:34:35 -07:00
Benjamin Abbott-Scott f877b9ecc4 Return every time lock acquisition fails 2015-07-22 10:44:47 -07:00
Calle Pettersson 73086996cf Fix missing config-dir in getting started guide 2015-07-22 13:33:15 +02:00
Travis Truman 182f881d82 Fixes #1099 by raising an error when we multiple private IPs are found 2015-07-16 22:25:02 -04:00
Ryan Uber c34bcb45c6 Merge pull request #1093 from buddhamagnet/master 
Switch to more idiomatic var syntax
 2015-07-14 12:53:58 -07:00
Ryan Uber 5339ee6cd9 Merge pull request #1112 from drawks/iss-1111 
Fix issue #1111 - vagrant cluster demo doesn't work
 2015-07-14 12:01:58 -07:00
Dave Rawks 5fbda6e4a4 Fix issue #1111 - vagrant cluster demo doesn't work 
Switch demo Vagrantfile to use official debian 7 base box
and reflect change in the README
 2015-07-14 11:43:18 -07:00
Ryan Uber 1bbdf3b03b agent: vet fixes 2015-07-14 11:42:51 -07:00
Ryan Uber 5d73afc13f consul: fixes for events and related tests 2015-07-14 11:38:26 -07:00
Seth Vargo 4a7f9dd9d4 Merge pull request #1109 from hashicorp/sethvargo/rack_protection 
Use Rack::Protection
 2015-07-13 12:59:20 -04:00
Seth Vargo d473fe5693 Use Rack::Protection 2015-07-13 12:56:46 -04:00
Seth Vargo 32906a9d3e Update middleman-hashicorp 2015-07-13 12:56:40 -04:00
Ryan Uber 5682b715c4 Merge pull request #995 from 42wim/rfc2308-soa-ttl 
Send SOA with negative responses (RFC2308)
 2015-07-13 08:49:25 -07:00
Ryan Breen cd41daba31 Merge pull request #1094 from BrianHicks/website/ciscocloud-consul-tools 
website: add marathon-consul and mesos-consul
 2015-07-08 20:01:31 -04:00
Brian Hicks 0f491d92f1 website: add marathon-consul and mesos-consul 2015-07-08 17:47:49 -06:00
buddhamagnet 462a03c1ab switch to more idiomatic var syntax 2015-07-08 23:22:12 +01:00
Ryan Uber 79ac4f3512 agent: testing keyring ACLs 2015-07-07 15:14:06 -06:00
Ryan Uber 58c26497a9 acl: adding negative tests for bad policy 2015-07-07 14:46:41 -06:00
Ryan Uber 38175f450b website: docs for keyring ACLs 2015-07-07 11:45:49 -06:00
Ryan Uber 02b49058a2 acl: more keyring tests 2015-07-07 11:21:27 -06:00
Ryan Uber 7e50a457d9 acl: allow omitting keyring policy, add tests 2015-07-07 11:07:37 -06:00
Ryan Uber 47a33e3f1a acl: keyring policy uses a flat string 2015-07-07 10:45:38 -06:00
Ryan Uber 5c65bc7df2 agent: write-level keyring ACLs work 2015-07-07 10:36:51 -06:00
Ryan Uber bffc0861cc agent: read-level keyring ACLs work 2015-07-07 10:30:34 -06:00
Ryan Breen 7cba295eb9 Merge pull request #1087 from edwardbadboy/master 
Website: Delete the unnecessary backslash at the end shell command line
 2015-07-06 23:40:09 -04:00
Zhou Zheng Sheng 85f7064fe0 Website: Delete the unnecessary backslash at the end shell command line 
Shell thinks '\<newline>' as line continuation only when it's unquoted
or in double quotes. It's not necessary to manually mark '\<newline>'
in single quotes, because when shell sees the a single quote starts, it
continues the line automatically until it sees the matching single quote
ends.

Thus,
echo 'a\
  b'
would give the following output
a\
  b

And
echo 'a
  b'
gives the following output
a
  b

Since we don't want to leave backslashes in the resulting json files, we
should remove the line continuation backslashes inside single quotes.
 2015-07-07 11:27:47 +08:00
Ryan Uber 1b8051a783 acl: initial pass at keyring ACLs 2015-07-06 18:28:09 -06:00
Armon Dadgar 2783f2bfec consul: fixing test using wrong FSM 2015-07-06 14:33:58 -06:00
Ryan Uber e37b5ecb69 Merge pull request #1046 from hashicorp/f-event-acl 
Event ACLs
 2015-07-02 07:02:07 -07:00
Ryan Uber 18715a445c agent: remove unnecessary EventFire function 2015-07-02 06:56:27 -07:00
Ryan Breen 9bbe09fb43 Merge pull request #1074 from ketzacoatl/patch-1 
Minor improvement to `acl_master_token` docs
 2015-07-01 15:59:14 -04:00
ketzacoatl b63041c3b0 Minor improvement to `acl_master_token` docs 
Confirm the expected format, and what happens if not provided.
 2015-07-01 15:34:35 -04:00
Armon Dadgar 9cb55266e7 Merge pull request #1029 from hashicorp/f-travis 
Use test target for travis-ci, remove flowdock
 2015-06-29 17:45:26 -07:00
Ryan Breen addb614509 Merge pull request #1066 from norbertpotocki/master 
Add cfg4j to website (community projects section)
 2015-06-28 16:20:53 -04:00
Norbert Potocki cec84be06d restore alphabetical order 2015-06-28 13:17:07 -07:00
Norbert Potocki b8b4b0f0d0 add cfg4j communicty project 2015-06-28 13:15:40 -07:00
Ryan Uber b1090469c2 Merge pull request #1055 from thorduri/master 
gc duplicate platform variable
 2015-06-25 09:54:43 -07:00
Ryan Uber 6290cb93bd website: adding tag/service name dns compliance docs 2015-06-25 09:08:38 -07:00
Thordur Bjornsson 15b6c6db20 gc duplicate platform variable 2015-06-25 08:39:22 +02:00
Ryan Uber ba5c3a4c81 Update CHANGELOG.md 2015-06-23 12:34:53 -07:00
Ryan Uber d0348d1291 Merge pull request #1004 from i0rek/advertise_addrs 
Add advertise_addrs.
 2015-06-23 12:32:07 -07:00
Hans Hasselberg 267e0caf81 Implement advertise_addrs for SerfLan, SerfWan and RPC. 
Fixes #550.
This will make it possible to configure the advertised adresses for
SerfLan, SerfWan and RPC. It will enable multiple consul clients on a
single host which is very useful in a container environment.

This option might override advertise_addr and advertise_addr_wan
depending on the configuration.

It will be configureable with advertise_addrs. Example:

{
  "advertise_addrs": {
    "serf_lan": "10.0.120.91:4424",
    "serf_wan": "201.20.10.61:4423",
    "rpc": "10.20.10.61:4424"
  }
}
 2015-06-23 21:23:45 +02:00
Ryan Uber 7e63572df6 website: document -token parameter for exec/event commands 2015-06-22 17:19:07 -07:00
Ryan Uber 320ab1448d command: remote exec takes -token parameter 2015-06-22 17:16:28 -07:00
Ryan Uber 71aae88f3f command: event command supports -token arg 2015-06-22 16:59:41 -07:00
Ryan Uber a7eecda22d Update CHANGELOG.md 2015-06-22 11:14:30 -07:00
Ryan Uber cc143fa03b Merge pull request #1050 from highlyunavailable/master 
Add RFC 6598 private IP range
 2015-06-22 11:01:44 -07:00
Ryan Uber c8b3e48cbf website: link to check pass/fail endpoint docs from checks page 2015-06-22 10:21:50 -07:00