Commit Graph

1606 Commits

Author SHA1 Message Date
Armon Dadgar 52f68c528f Merge pull request #494 from epankala/version
Update to 'consul version' behaviour
2014-11-24 11:03:00 -08:00
Armon Dadgar b00ac0f2a3 Merge pull request #492 from sosedoff/comment-fix
Comment fix
2014-11-23 23:05:07 -08:00
Janne Paenkaelae b733df334b Update to 'consul version' behaviour
After e6b6f181728b88c2e430fc7ad71fe1f84db3418c if consul was built
with just running "go build" the GitDescribe would be empty and consul
version would be empty.

This change alters the behaviour so that if consul is build without
proper ldflags the version will be postfixed with "dev" prerelease to
indicate that it is self compiled in a wrong way.

Should someone have a bug in such a binary at least devs should easily
see from the version number that binary has not been created by
recommended means.
2014-11-23 15:42:08 +00:00
Dan Sosedoff 6cb25cf573 Fix comment for commands map 2014-11-22 11:44:23 -06:00
Armon Dadgar ddc49f98a5 Merge pull request #491 from BCWilsonDotCom/patch-1
correct the doc for obtaining formatted json
2014-11-21 13:00:13 -08:00
Brandon Wilson 22ad8172b8 correct the doc for obtaining formatted json
was "?pretty" should be "?pretty=1"
2014-11-21 12:27:48 -08:00
Armon Dadgar b58b35d659 Merge pull request #487 from amalaviy/ephemeral_keys
Ephemeral Nodes for via Session behavior settings.
2014-11-21 10:11:52 -08:00
Armon Dadgar 67e4f66812 Merge pull request #489 from hashicorp/h-event-watch
Preserve ordering of event buffer when filtering on name
2014-11-21 10:10:33 -08:00
Ryan Uber 3d4ea8142c agent: make event buffer test non-sequential 2014-11-20 21:56:50 -08:00
Ryan Uber 3f5e0d8ec0 agent: Test event order preservation for watches 2014-11-20 20:35:52 -08:00
Ryan Uber 5badc695b8 agent: Preserve ordering of event buffer. Fixes #479 2014-11-20 19:51:08 -08:00
Atin Malaviya d7e09d57ba Set empty Behavior setting into SessionKeysRelease and flag error for unrecognized values 2014-11-20 19:16:07 -05:00
Atin Malaviya 3aabda02b3 Clean up tests, use switch to default session.Behavior value if unspecified, unrecognized 2014-11-20 14:29:18 -05:00
Atin Malaviya aa0cecd04e Ephemeral Nodes for via Session behavior settings.
Added a "delete" behavior for session invalidation, in addition to
the default "release" behavior. On session invalidation, the sessions
Behavior field is checked and if it is set to "delete", all nodes owned
by the session are deleted. If it is "release", then just the locks
are released as default.
2014-11-20 11:34:45 -05:00
Ryan Uber a9c84b9d18 Merge pull request #336 from ryanuber/f-keyring
feature: gossip encryption key rotation
2014-11-19 23:18:44 -08:00
Ryan Uber accf2bbb59 agent: remove unused config variable 2014-11-19 23:18:12 -08:00
Ryan Uber 4cd89a9113 Rebase against upstream 2014-11-19 16:45:49 -08:00
Ryan Uber a675b5faae agent: fix gossip encryption detection 2014-11-19 16:37:40 -08:00
Ryan Uber c9118b53bf agent: fix loading keyring on agent start 2014-11-19 16:37:40 -08:00
Ryan Uber 196cbd27b2 agent: ignore -encrypt if provided when keyring exists 2014-11-19 16:37:40 -08:00
Ryan Uber 3b2ab70c4d consul: clean up comments, fix globalRPC tests 2014-11-19 16:37:40 -08:00
Ryan Uber 4a8249db00 consul: fix obscure bug when launching goroutines from for loop 2014-11-19 16:37:40 -08:00
Ryan Uber 2661bbfa27 consul: more tests, remove unused KeyManager() method 2014-11-19 16:37:40 -08:00
Ryan Uber fcacee723b consul: simplify keyring operations 2014-11-19 16:36:19 -08:00
Ryan Uber 66ad81ef13 consul: add test for internal keyring rpc endpoint 2014-11-19 16:36:19 -08:00
Ryan Uber 344b63b9db consul: simplify keyring operations 2014-11-19 16:36:19 -08:00
Ryan Uber 00fc7fa1dd command/keyring: adjust command help 2014-11-19 16:36:18 -08:00
Ryan Uber b3f251de9c command/keyring: clean up tests 2014-11-19 16:36:18 -08:00
Ryan Uber f24ac482e3 agent: fix test cases 2014-11-19 16:36:18 -08:00
Ryan Uber bb9617642a agent: make rpc tests more reliable 2014-11-19 16:36:01 -08:00
Ryan Uber 9217e371bc website: document new behavior of the -encrypt option 2014-11-19 16:36:01 -08:00
Ryan Uber d02afd42fb agent: -encrypt appends to keyring if one exists 2014-11-19 16:36:01 -08:00
Ryan Uber 295f876923 command/agent: fix up gossip encryption indicator 2014-11-19 16:35:37 -08:00
Ryan Uber c59107f08e command: remove -init argument from keyring, auto-persist keyrings when using agent -encrypt 2014-11-19 16:35:13 -08:00
Ryan Uber 7f85c708dc agent: squash some more common keyring semantics 2014-11-19 16:34:18 -08:00
Ryan Uber 4e8f53fa5d consul: detach executeKeyringOp() from *Internal 2014-11-19 16:34:18 -08:00
Ryan Uber daebf39946 agent: guard against empty keyring files 2014-11-19 16:34:18 -08:00
Ryan Uber db0084ccd0 consul: use keyring operation type to cut out duplicated logic 2014-11-19 16:34:18 -08:00
Ryan Uber 057c22db10 consul: generalize multi-DC RPC call broadcasts 2014-11-19 16:34:18 -08:00
Ryan Uber 33dea16567 agent: fix install key test 2014-11-19 16:34:18 -08:00
Ryan Uber 08f1605159 website: clean up keyring command docs and add output examples 2014-11-19 16:34:18 -08:00
Ryan Uber 001a579d47 command/keyring: cleanup 2014-11-19 16:34:18 -08:00
Ryan Uber cb795199d1 consul: test rpc errors returned from remote datacenters 2014-11-19 16:34:18 -08:00
Ryan Uber a1943afddc consul: make forwarding to multiple datacenters parallel 2014-11-19 16:34:18 -08:00
Ryan Uber d7edc1c51c consul: break rpc forwarding and response ingestion out of internal endpoints 2014-11-19 16:34:18 -08:00
Ryan Uber bea19b5135 command/keyring: refactor, adjust tests 2014-11-19 16:34:18 -08:00
Ryan Uber c1ea291112 command: fix panic when client RPC is asked for a keyring operation 2014-11-19 16:34:17 -08:00
Ryan Uber 1ec111bbfc consul: kill unused struct fields 2014-11-19 16:34:17 -08:00
Ryan Uber c4a9291bb9 command/keyring: remove unneeded -wan arg, fix tests 2014-11-19 16:34:17 -08:00
Ryan Uber 6277a76a9d agent: adjust rpc client tests for keyring 2014-11-19 16:34:17 -08:00