This closes #531
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/11048286
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/11048286
Diff:
fix CompositeEffector logic
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/119ba5a4
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/119ba5a4
Diff:
add CompositeEffectorYamlRebindTest
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/8809d5cd
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/8809d5cd
Diff:
Repository: brooklyn-server
Updated Branches:
refs/heads/master 39301e0f7 -> 110482861
Add DurationPredicates
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/070c6f54
Tree:
This closes #555
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/fd033127
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/fd033127
Diff:
fix merge errors
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/1871a521
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/1871a521
Diff:
fix version reference in config inheritance test
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/71776629
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/71776629
Diff:
Merge branch 'master' into inherit-config-default-values
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/0a55a824
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/0a55a824
Diff:
Repository: brooklyn-server
Updated Branches:
refs/heads/master 3c5981b57 -> 39301e0f7
fix test for taking default from parameter
as per (1) at https://issues.apache.org/jira/browse/BROOKLYN-329
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit:
add failing test from @geomacy
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/6560e581
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/6560e581
Diff:
Merge branch 'master' into inherit-config-default-values
Conflicts:
camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigParametersYamlTest.java
core/src/main/java/org/apache/brooklyn/core/config/internal/AbstractConfigMapImpl.java
address PR comment, move list recompute to after loop
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/3529f176
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/3529f176
Diff:
Config inheritance: test improvements
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/49835acf
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/49835acf
Diff:
document better config inheritance semantics
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/aef2c7c5
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/aef2c7c5
Diff:
don't use transients as not reset on deserialization
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/536fb1a7
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/536fb1a7
Diff:
migrate config inheritance to new classes
pioneers use of `readResolve` that actually works brilliantly out of the box
due to xstream
also tidying `BasicConfigInheritance` and adding a placeholder (not used yet)
for resolving ancestor defaults
includes tests for config inheritance
use constants for the count checks in SpecParameterUnwrappingTest
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/11a96606
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/11a96606
Diff:
merge default values in config inheritance
as per (6) at https://issues.apache.org/jira/browse/BROOKLYN-329
(only does it for yaml parameters, but that's a limitation we can live with i
think;
notes included on doing it for java)
also switches to new `fromString` which adjusts the
uncomment another assertion about inherited config
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/2d762c4c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/2d762c4c
Diff:
need to restrict keys to those present for ssh commands
else we pick up `null` values ... alternatively could take declared and filter
for nulls,
but this change restores the old working behaviour
if ever we need to get default values of keys when passing in this way, we
should revert this and
address most PR comments
still to do:
* version refs in deprecation notes
* geomacy's test case and parameter order
* aled's tests
* several comments from neykov re SpecParameterUnwrappingTest.java
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit:
align signature as per PR comment, and trivial deprecation/warning fixes
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/b1b84434
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/b1b84434
fix so that list of declared config keys excludes those not reinherited
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/db1f7529
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/db1f7529
improve methods for retrieving config keys
previously only looked at what was in the map, not what reference keys might be
defined in the container (eg entity)
as per (5) at https://issues.apache.org/jira/browse/BROOKLYN-329
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
clean up SpecParameterUnwrappingTest
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/b66c5966
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/b66c5966
Diff:
implement inheritance of config default values
test and code changes to respect the additional inheritance argument added in
the previous request:
resolves https://issues.apache.org/jira/browse/BROOKLYN-267
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit:
newly deprecated items now refer to 0.11.0 not 0.10.0
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d2e23c42
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d2e23c42
Diff:
This closes #462
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/39301e0f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/39301e0f
Diff:
comments on parameter/config inheritance/merging
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/944757ce
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/944757ce
Diff:
Repository: brooklyn-server
Updated Branches:
refs/heads/master 1c994df7d -> 3c5981b57
REST endpoint for an activity children has `includeBackground` option
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit:
This closes #559
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/3c5981b5
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/3c5981b5
Diff:
fix AddChildrenEffector to handle the problem cases just identified (json w
params and/or dsl)
one failing test due to DSL toString process
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/b3cc2dd5
Tree:
fixes from PR review
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/c8a462dd
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/c8a462dd
Diff:
add DSL support for config and attributeWhenReady to take functional arguments
implementing several of the tests marked WIP
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/b70346cc
Tree:
Merge branch 'master' of https://github.com/apache/brooklyn-server
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/1c994df7
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/1c994df7
Diff:
Merge branch 'master' into tidy-add-children-effector
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/a1b5e3f4
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/a1b5e3f4
Diff:
Repository: brooklyn-server
Updated Branches:
refs/heads/master 38396711d -> 1c994df7d
tests indicating current behaviour, including things we don't like
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit:
Improve DSL toString methods to produce re-parseable output
Adding a simpler way to test the DSL, and adding support for entity("ID")
where ID is the internal ID
(also allowing more complex items entity(config("targetEntity")).
Project:
tidy of CreatePassword test
no reason for it to be integration, or to use EmptySoftware, or be in a package
called "policy"
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/df62c17f
Tree:
fix test failures where error message slightly changed
and remove extra $brooklyn:$brooklyn, with test
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/db14c5e0
Tree:
Repository: brooklyn-server
Updated Branches:
refs/heads/master 0f649fe17 -> 38396711d
BROOKLYN-433: regex/obj config key constraint in yaml
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/4bda12b7
This closes #558
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/38396711
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/38396711
Diff:
This closes #39
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/fa2d7b3d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/fa2d7b3d
Diff:
Repository: brooklyn-client
Updated Branches:
refs/heads/master 88bb5e7bd -> fa2d7b3db
adds flag for connecting to servers using self-sign ssl, fixing existing code
that handles flags
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo
Commit:
44 matches
Mail list logo