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

8600 Commits

Author SHA1 Message Date
John Cowen cdd9556d15
Merge pull request #4241 from hashicorp/bugfix/gh-4203-multi-tags 
[BUGFIX] Ensure all tags for a service are listed on the service detail page
 2018-06-20 09:17:40 +01:00
John Cowen 4d7f15ce34
Merge branch 'master' into bugfix/gh-4203-multi-tags 2018-06-20 09:17:23 +01:00
John Cowen 1d816e85af
Merge pull request #4228 from hashicorp/feature/minor-css-amends 
UI - minor css amends
 2018-06-20 09:15:34 +01:00
Matt Keeler 7f7c703118 Update the runtime tests 2018-06-19 13:59:26 -04:00
Matt Keeler aff1b93268 Update ui-v2 makefile to handle updating node_modules when needed 
Also dont include the dist and node_modules folders in the build context.
 2018-06-19 13:51:49 -04:00
Matt Keeler 21fcb45f36 PR Updates 2018-06-19 12:47:58 -04:00
Matt Keeler 90e74da6b7 Fix a couple find warnings on linux 
Additionally add the ability to use go install for dev builds rather than gox (travis doesn’t have gox)
 2018-06-19 10:49:07 -04:00
Matt Keeler 8216816e3f Make filtering out TXT RRs only apply when they would end up in Additional section 
ANY queries are no longer affected.
 2018-06-19 10:08:16 -04:00
John Cowen 6949b22d5f Sort ACL tokens by name 2018-06-19 10:51:31 +01:00
John Cowen 3c02e17fa7 Make sure the body background is white 2018-06-19 10:25:41 +01:00
Matt Keeler 12d14f6c54 Allow for building pre-releases/rcs/betas 2018-06-18 17:06:38 -04:00
Omar Khawaja 8f66362770
update encryption doc and add guide for creating certificates (#4238) 
* update encryption doc and add guide for creating certificates in consul with cfssl

* add details about CLI and disabling HTTP

* delete $ symbols and add guide elements

* add missing periods and steps heading
 2018-06-18 15:25:35 -04:00
Siva bf264981c9 Merge branch 'master' of github.com:hashicorp/consul into WinService 2018-06-18 14:55:38 -04:00
Siva e5ad1dd576 Added Side Effect import for Windows Service 2018-06-18 14:55:11 -04:00
Matt Keeler 9457468423 Quote $@ when passing around 2018-06-18 14:53:50 -04:00
Siva 411b24d95d Added Hook for Windows Service 2018-06-18 14:49:59 -04:00
Stanley Shilov c06dfb3d2d Sessions TTL should be of type string in ui-v2 2018-06-18 13:41:22 -05:00
Matt Keeler 075f4b64ae Quote some make vars 2018-06-18 14:39:34 -04:00
John Cowen 5909d5695e Sets code editor height to be auto, with a reasonable min height 2018-06-18 19:07:57 +01:00
John Cowen 31b6e10391
Merge pull request #4235 from hashicorp/bugfix/move-rsync-to-test 
Move the rsync dependency to the test scripts
 2018-06-18 19:00:27 +01:00
Matt Keeler 04ea404414 Fix gpg_key usage, also make the location of the binary to check the version of overridable 2018-06-18 13:42:46 -04:00
Matt Keeler fcd1811402 Don’t automatically populate release with dev when not generating a version based off git vars 2018-06-18 13:20:12 -04:00
Matt Keeler 46cfa577b0 Set the binary type 2018-06-18 13:09:41 -04:00
Matt Keeler 5381e78520 Pass the right var to git_push_ref 2018-06-18 12:34:30 -04:00
Matt Keeler 31b918d554 Return early when git changes are denied 2018-06-18 12:33:59 -04:00
Matt Keeler b739bbfefe Fixup version release detection 2018-06-18 11:57:35 -04:00
Matt Keeler ca1a0619bd Refactor a little to accomodate overriding packaging using directories 2018-06-18 11:33:16 -04:00
John Cowen 04435dbdaf Ensure all tags for a service are listed on the service detail page 2018-06-18 15:38:52 +01:00
Matt Keeler 82857b2121 Use CONSUL_PKG_NAME in package_release 2018-06-18 10:26:04 -04:00
Matt Keeler f74386d425 Fix a bug in parse_version that prevented using auxillary version files 2018-06-18 10:07:29 -04:00
Matt Keeler 4daf669136 Only remove builds with the same suffix 2018-06-18 09:57:12 -04:00
Matt Keeler ebe6ca167f Add notion of a consul pkg name to coexist with enterprise 2018-06-18 09:32:00 -04:00
Matt Keeler 2dc2e94f31 Make sure to commit all version*.go files 2018-06-18 09:22:31 -04:00
Matt Keeler 4c9db8c5d0 Update the name of a function source 2018-06-18 09:21:38 -04:00
Matt Keeler 4bbd20ddfa Dont override set but null vars 2018-06-18 09:16:08 -04:00
Matt Keeler 414829f68b Make some room for overrides of build system functions 2018-06-18 09:06:57 -04:00
Matt Keeler 3f290cc676 Generalize git pushing in a bash function 2018-06-15 20:42:07 -04:00
Matt Keeler 30ff8b195b Add rsync so the ui can build again 
Also add back the init target to the ui-v2 makefile
 2018-06-15 14:44:14 -04:00
Matt Keeler 13c72cac0e Merge remote-tracking branch 'origin/master' into release-build-updates 
# Conflicts:
#	scripts/consul-builder/Dockerfile
#	ui-v2/GNUmakefile
 2018-06-15 14:40:09 -04:00
Jack Pearkes bed22a81e9
Merge pull request #4233 from fossas/master 
Fix invalid vendor.json syntax for go-discover
 2018-06-15 09:10:29 -07:00
John Cowen fb4643b062 Move the rsync dependency to the test scripts for now. 
1. You only need the fixtures for testing, don't force rsync on people
for just building
2. Eventually this will go and be replaced by something broccoli-y
 2018-06-15 16:11:14 +01:00
Matt Keeler 197e2f69d5 Switch over to defaulting to the new UI 2018-06-15 09:20:13 -04:00
John Cowen bf4bcdd670 Find a way to test pre-ember load 
1. Also add index.html things to test/index.html
2. Use content-for to hedge against keeping content in sync (requires an
addon)
3. Test passes but only when run on its own, as we need to rely on
content in the QUnit runner, theoretically it is not running our test in
isolation. Skipping the test for the moment so we don't have a filaing
test when all run together
 2018-06-15 13:56:45 +01:00
Matt Keeler 147e4a1eae Add capability to put tree back into dev mode via make dev-tree 2018-06-15 08:00:12 -04:00
Leo Zhang 7f6d727aa5
Fix invalid vendor.json syntax for go-discover 2018-06-15 02:02:12 -07:00
Matt Keeler 48910f7583 Update the scripting 
Automated putting the source tree into release mode.
 2018-06-14 21:42:47 -04:00
Matt Keeler e762d6fd82
Merge pull request #4229 from hashicorp/mitchellh/builder-rsync 
Add rsync to consul-builder
 2018-06-14 13:06:24 -04:00
Mitchell Hashimoto f6989e6326
Add rsync to consul-builder 
The V2 UI build now requires `rsync` to be installed as part of its build process.

Without this, `make ui` will fail today.
 2018-06-14 09:59:10 -07:00
Kyle Havlovitz ab4a9a94f4
Re-use uint8ToString 2018-06-14 09:42:23 -07:00
Kyle Havlovitz 61d7e38148
Clarify CA commands' help text 2018-06-14 09:42:23 -07:00