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

3583 Commits

Author SHA1 Message Date
James Phillips c353aa9260 Catches up the change log. 2016-01-20 16:59:46 -08:00
James Phillips bfb1b7da99 Merge pull request #1632 from hashicorp/b-orphaned-watches 
Prevents watches from being orphaned when KVS blocking queries loop.
 2016-01-20 16:39:48 -08:00
James Phillips 01da5a2248 Prevents watches from being orphaned when KVS blocking queries loop. 2016-01-20 07:18:47 -08:00
James Phillips e7f4bd8a39 Merge pull request #1631 from Cinderhaze/master 
Correcting count of checks
 2016-01-19 19:56:58 -08:00
Daryl b2f8ef9f32 Correcting count of checks 
I saw there were 5 checks listed - script, tcp, http, ttl, docker.
 2016-01-19 22:50:27 -05:00
James Phillips b6f03d39cc Merge pull request #1619 from hashicorp/b-internal-ui 
Fixes the static asset generator for new pkg path, updates assets.
 2016-01-15 10:26:49 -08:00
James Phillips f24a044755 Fixes the static asset generator for new pkg path, updates assets. 2016-01-15 10:21:42 -08:00
James Phillips 8683896465 Merge pull request #1617 from hashicorp/slackpad-patch-1 
Fixes the years in the change log.
 2016-01-15 08:17:54 -08:00
James Phillips 86bc93faff Fixes the years in the change log. 2016-01-15 08:17:42 -08:00
James Phillips c75cd7a8ff Merge pull request #1613 from hashicorp/slackpad-patch-1 
Changes readme Go version to 1.5.3.
 2016-01-14 19:56:09 -08:00
James Phillips cc00786580 Changes readme Go version to 1.5.3. 2016-01-14 19:55:57 -08:00
James Phillips 8a9883e48e Merge pull request #1612 from hashicorp/slackpad-patch-1 
Bumps website version to 0.6.3.
 2016-01-14 19:55:02 -08:00
James Phillips 84594c36dd Bumps website version to 0.6.3. 2016-01-14 19:54:55 -08:00
James Phillips 94d3f881fe Merge pull request #948 from hashicorp/iface-down-fix 
Don't try to bind on address from inactive interface
 2016-01-14 17:00:54 -08:00
James Phillips e0b6725ef5 Merge pull request #1611 from hashicorp/f-next-version 
Puts tree in state ready for work on Consul 0.7.
 2016-01-14 16:07:38 -08:00
James Phillips 5f54bd4418 Puts tree in state ready for work on Consul 0.7. 2016-01-14 16:03:08 -08:00
Kevin Simper 72353c5ad3 Updating dns forwarding 
It is not really clear that you only have to do one of the following and not all three.
 2016-01-14 22:53:14 +01:00
James Phillips c933efde50
Release v0.6.3 2016-01-14 10:28:49 -08:00
James Phillips 29245ae1ae Merge pull request #1608 from hashicorp/f-deps 
Adds deps for the 0.6.3 release.
 2016-01-14 10:25:31 -08:00
James Phillips 634d2a8845 Adds deps for the 0.6.3 release. 2016-01-14 10:24:54 -08:00
James Phillips cac59336fa Merge pull request #1607 from hashicorp/slackpad-patch-1 
Preps the change log for the 0.6.3 release.
 2016-01-14 10:24:19 -08:00
James Phillips a1c0ed5093 Preps the change log for the 0.6.3 release. 2016-01-14 10:23:54 -08:00
James Phillips 20847cfc49 Merge pull request #1606 from hashicorp/f-vbox 
Bumps up vbox resources for better unit test performance.
 2016-01-14 10:16:42 -08:00
James Phillips cc6c92540a Bumps up vbox resources for better unit test performance. 2016-01-14 10:15:48 -08:00
James Phillips da23b43736 Merge pull request #1598 from Cbeck527/master 
Update consul version for vagrant demo
 2016-01-13 19:26:05 -08:00
Seth Vargo f4e085ec61 Remove old heroku stuff 2016-01-13 21:54:26 -05:00
James Phillips 5d1ded1f84 Merge pull request #1603 from hashicorp/f-post-release-picks 
Post 0.6.2 release picks
 2016-01-13 18:41:29 -08:00
James Phillips b1ade92032 Bumps version up to 0.6.3. 2016-01-13 18:39:49 -08:00
James Phillips 950831fa9d Adds deps for v0.6.2. 2016-01-13 18:39:20 -08:00
James Phillips b005848b20 Merges the 0.6.2 change log with master. 2016-01-13 18:38:42 -08:00
James Phillips 2b173475b7 Bumps Go version to 1.5.3. 2016-01-13 18:36:43 -08:00
James Phillips 3c3c15f47f Merge pull request #1602 from hashicorp/slackpad-patch-1 
Bumps website version to 0.6.2.
 2016-01-13 17:37:47 -08:00
James Phillips 182628dace Bumps website version to 0.6.2. 2016-01-13 17:37:39 -08:00
Seth Vargo 3c58463c97 Remove old website push script 2016-01-13 20:23:49 -05:00
Ryan Breen 536e0c7391 Merge pull request #1601 from bensojona/b-semaphore-typo 
Fix semaphore typo
 2016-01-13 20:15:00 -05:00
Jon Benson dcd01d1858 Fix semaphore typo 2016-01-13 16:56:40 -08:00
Seth Vargo 1001fe3d41 Use sync instead of put 2016-01-13 19:41:22 -05:00
Seth Vargo f5ffa8fb79 Fix broken link 2016-01-13 19:32:30 -05:00
Seth Vargo b08efe2cd5 Remove bad CSS 2016-01-13 19:31:52 -05:00
Seth Vargo b84c0583f5 Update middleman 2016-01-13 19:19:34 -05:00
Seth Vargo dfa431f3bd Merge pull request #1600 from hashicorp/sethvargo/deploy 
Add Atlas deployment scripts
 2016-01-13 19:13:24 -05:00
Seth Vargo 3db4e3dccb Add Atlas deployment scripts 2016-01-13 19:05:04 -05:00
Seth Vargo 2fc7b6c610 Remove Ruby requirement from Gemfile 2016-01-13 18:04:05 -05:00
Seth Vargo 2c32c81338 Merge pull request #1599 from hashicorp/sethvargo/image_optim 
Optimize images
 2016-01-13 18:03:26 -05:00
Seth Vargo 4994d9108e Optimize images 2016-01-13 18:00:47 -05:00
Chris Becker 0effdbad5b Update consul version for vagrant demo 2016-01-13 17:56:19 -05:00
James Phillips 57cf69df15 Merge pull request #1597 from hashicorp/sethvargo/links 
Use HTTPS + www. where appropriate
 2016-01-13 14:46:07 -08:00
Seth Vargo cae0ff354a Use HTTPS + www. where appropriate 2016-01-13 17:44:01 -05:00
James Phillips 5e4c65a7d7 Merge pull request #1595 from hashicorp/f-next-release 
Preps for the next Consul release, 0.6.2.
 2016-01-13 11:20:25 -08:00
James Phillips 8872cd3fe2 Preps for the next Consul release, 0.6.2. 2016-01-13 11:19:14 -08:00