You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/03/18 12:06:37 UTC
[16/18] brooklyn-server git commit: Merge branch 'master' into
fix-location-leak
Merge branch 'master' into fix-location-leak
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/138e0f66
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/138e0f66
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/138e0f66
Branch: refs/heads/master
Commit: 138e0f66397f57779dc2eb64b14f60081aa2496d
Parents: 41a8d66 16ee522
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Mar 17 18:45:09 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Mar 17 18:45:09 2016 +0000
----------------------------------------------------------------------
.../core/entity/lifecycle/ServiceStateLogic.java | 6 ++++++
.../stock/AbstractMultipleSensorAggregator.java | 18 +++++++++---------
2 files changed, 15 insertions(+), 9 deletions(-)
----------------------------------------------------------------------