Consul is a distributed, highly available, and data center aware solution to connect and configure applications across dynamic, distributed infrastructure.
 
 
 
 
 
 
Go to file
RJ Spiker 37996e76ca website - separate js components so they're only called if needed 2018-06-25 12:26:18 -07:00
.github/ISSUE_TEMPLATE github: more tweaking of bug issue template 2018-05-10 17:29:50 -07:00
acl acl: IntentionDefault => IntentionDefaultAllow 2018-06-14 09:41:55 -07:00
agent agent: convert the proxy bind_port to int if it is a float 2018-06-25 12:26:18 -07:00
api connect/ca: update Consul provider to use new cross-sign CSR method 2018-06-25 12:25:41 -07:00
bench
command Refactor to use embedded struct. 2018-06-25 12:25:39 -07:00
connect Fix test broken by final telemetry PR change! 2018-06-25 12:25:40 -07:00
demo Enables dig in cluster demo by installing dnsutils 2018-04-13 18:01:42 +01:00
ipaddr New config parser, HCL support, multiple bind addrs (#3480) 2017-09-25 11:40:42 -07:00
lib Refactor to use embedded struct. 2018-06-25 12:25:39 -07:00
logger golint: Untangle if blocks with return in else 2017-04-25 09:26:13 -07:00
scripts Update UI for beta3 2018-06-25 12:25:16 -07:00
sentinel Renames stubs to be more consistent. 2017-11-29 18:36:52 -08:00
snapshot Removes timeout when restoring snapshots. 2017-12-13 14:10:54 -08:00
terraform Spelling (#3958) 2018-03-19 16:56:00 +00:00
test Update test certificates that expire this year to be way in the future 2018-05-12 10:15:45 +01:00
testrpc agent: move agent/consul/structs to agent/structs 2017-08-09 14:32:12 +02:00
testutil Misc test fixes 2018-06-25 12:25:39 -07:00
tlsutil 🐛 Formatting changes only; add missing trailing commas 2018-03-15 10:19:46 -07:00
types
ui v1.1.0 UI Build 2018-05-11 17:05:20 +01:00
ui-v2 Change the appearance of `*` for intention listings 2018-06-25 12:26:18 -07:00
vendor Remove build tags from vendored vault file to allow for this to merge properly into enterprise 2018-06-25 12:26:10 -07:00
version bump to beta4 2018-06-25 12:26:01 -07:00
watch Misc test fixes 2018-06-25 12:25:39 -07:00
website website - separate js components so they're only called if needed 2018-06-25 12:26:18 -07:00
.gitignore Update .gitignore - ignore some macos fs event notification stuff 2018-05-24 10:34:23 -04:00
.travis.yml Travis evaluates ENV before cloning git repo and cding so we need to delay gathering packages until the makefile 2018-02-21 12:54:23 +00:00
CHANGELOG.md Formatting change keeps coming up running make 2018-06-25 12:25:16 -07:00
GNUmakefile Remove temporary hacks from Makefile 2018-06-14 09:42:10 -07:00
INTERNALS.md Spelling (#3958) 2018-03-19 16:56:00 +00:00
LICENSE
README.md Readme for Fork Instructions 2018-06-14 09:41:39 -07:00
Vagrantfile Adds a basic Linux Vagrant setup, stolen from Nomad. 2017-10-06 08:10:12 -07:00
key.pem Working proxy config reload tests 2018-06-14 09:42:05 -07:00
main.go Abandon daemonize for simpler solution (preserving history): 2018-06-25 12:24:10 -07:00
main_test.go

README.md

This is a temporary README. We'll restore the old README prior to PR upstream.

Consul Connect

This repository is the forked repository for Consul Connect work to happen in private prior to public release. This README will explain how to safely use this fork, how to bring in upstream changes, etc.

Cloning

To use this repository, clone it into your GOPATH as usual but you must rename consul-connect to consul so that Go imports continue working as usual.

Important: Never Modify Master

NEVER MODIFY MASTER! NEVER MODIFY MASTER!

We want to keep the "master" branch equivalent to OSS master. This will make rebasing easy for master. Instead, we'll use the branch f-connect. All feature branches should branch from f-connect and make PRs against f-connect.

When we're ready to merge back to upstream, we can make a single mega PR merging f-connect into OSS master. This way we don't have a sudden mega push to master on OSS.

Creating a Feature Branch

To create a feature branch, branch from f-connect:

git checkout f-connect
git checkout -b my-new-branch

All merged Connect features will be in f-connect, so you want to work from that branch. When making a PR for your feature branch, target the f-connect branch as the merge target. You can do this by using the dropdowns in the GitHub UI when creating a PR.

Syncing Upstream

First update our local master:

# This has to happen on forked master
git checkout master

# Add upstream to OSS Consul
git remote add upstream https://github.com/hashicorp/consul.git

# Fetch it
git fetch upstream

# Rebase forked master onto upstream. This should have no changes since
# we're never modifying master.
git rebase upstream master

Next, update the f-connect branch:

git checkout f-connect
git rebase origin master