57dfd1f46a
fix base64 issue
2015-07-23 15:56:23 +08:00
3cd8a0c214
fix 中文乱码问题
2015-07-23 14:47:32 +08:00
f1a83a8954
Merge pull request #1119 from trumant/multiple_private_IPs
...
Fixes #1099 by raising an error when we multiple private IPs are found
2015-07-22 17:32:00 -07:00
6f42f6640c
command/lock: Check for shutdown during lock acquisition. Fixes #800
2015-07-22 16:07:44 -07:00
2b93e5f52c
Merge pull request #1080 from zendesk/master
...
Return every time lock acquisition fails
2015-07-22 15:30:46 -07:00
00691a0f02
Merge pull request #1127 from carlpett/master
...
Fix missing config-dir in getting started guide
2015-07-22 12:34:35 -07:00
eece6e4848
Return every time lock acquisition fails
2015-07-22 10:44:47 -07:00
2e03fa1648
Fix missing config-dir in getting started guide
2015-07-22 13:33:15 +02:00
e18a93ed54
Fixes #1099 by raising an error when we multiple private IPs are found
2015-07-16 22:25:02 -04:00
1b6ce88d6d
Merge pull request #1093 from buddhamagnet/master
...
Switch to more idiomatic var syntax
2015-07-14 12:53:58 -07:00
bfcca7ae24
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
ef36aec2e4
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
f424f94d45
agent: vet fixes
2015-07-14 11:42:51 -07:00
6d27334ee1
consul: fixes for events and related tests
2015-07-14 11:38:26 -07:00
403a01dcbb
Merge pull request #1109 from hashicorp/sethvargo/rack_protection
...
Use Rack::Protection
2015-07-13 12:59:20 -04:00
5992548d8a
Use Rack::Protection
2015-07-13 12:56:46 -04:00
bcfc07e09c
Update middleman-hashicorp
2015-07-13 12:56:40 -04:00
8e834ba976
Merge pull request #995 from 42wim/rfc2308-soa-ttl
...
Send SOA with negative responses (RFC2308)
2015-07-13 08:49:25 -07:00
242f0ee3d8
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
f3e5c4b58d
website: add marathon-consul and mesos-consul
2015-07-08 17:47:49 -06:00
f71e66f8e1
switch to more idiomatic var syntax
2015-07-08 23:22:12 +01:00
5adf13e381
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
0a2a6e570a
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
fd2bead478
consul: fixing test using wrong FSM
2015-07-06 14:33:58 -06:00
503fa1eed1
Merge pull request #1046 from hashicorp/f-event-acl
...
Event ACLs
2015-07-02 07:02:07 -07:00
d2eac37579
agent: remove unnecessary EventFire function
2015-07-02 06:56:27 -07:00
eeb0d7733d
Merge pull request #1074 from ketzacoatl/patch-1
...
Minor improvement to `acl_master_token` docs
2015-07-01 15:59:14 -04:00
efc2d316c1
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
d754f07f4c
Merge pull request #1029 from hashicorp/f-travis
...
Use test target for travis-ci, remove flowdock
2015-06-29 17:45:26 -07:00
8fc15f29a1
Merge pull request #1066 from norbertpotocki/master
...
Add cfg4j to website (community projects section)
2015-06-28 16:20:53 -04:00
255c4e308f
restore alphabetical order
2015-06-28 13:17:07 -07:00
20abf0dabe
add cfg4j communicty project
2015-06-28 13:15:40 -07:00
34d507a9c2
Merge pull request #1055 from thorduri/master
...
gc duplicate platform variable
2015-06-25 09:54:43 -07:00
cb0043e8f8
website: adding tag/service name dns compliance docs
2015-06-25 09:08:38 -07:00
5a7ff77ab4
gc duplicate platform variable
2015-06-25 08:39:22 +02:00
3f91bb70ab
Update CHANGELOG.md
2015-06-23 12:34:53 -07:00
715f69cce8
Merge pull request #1004 from i0rek/advertise_addrs
...
Add advertise_addrs.
2015-06-23 12:32:07 -07:00
4598087df3
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
d893a60534
website: document -token parameter for exec/event commands
2015-06-22 17:19:07 -07:00
5866588d68
command: remote exec takes -token parameter
2015-06-22 17:16:28 -07:00
1f68b5268b
command: event command supports -token arg
2015-06-22 16:59:41 -07:00
d591bed3b5
Update CHANGELOG.md
2015-06-22 11:14:30 -07:00
713661a035
Merge pull request #1050 from highlyunavailable/master
...
Add RFC 6598 private IP range
2015-06-22 11:01:44 -07:00
d529329944
website: link to check pass/fail endpoint docs from checks page
2015-06-22 10:21:50 -07:00
f1932e5e46
Add RFC 6598 private IP range
...
Fixes #1031 by adding 100.64.0.0/10 as a private IP range.
2015-06-19 12:20:30 -07:00
457cff1007
website: fix event acl policy docs
2015-06-19 12:18:09 -07:00
bfaf11d3d6
acl: fix spelling in tests
2015-06-19 10:20:38 -07:00
e0ce6059f6
website: add docs for user event acls
2015-06-18 18:13:29 -07:00
5c9cf8cc69
agent: avoid masking errors when ACLs deny a request
2015-06-18 18:13:29 -07:00
4a95f29e03
agent: testing user event endpoint ACLs
2015-06-18 18:13:29 -07:00
孔晨