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 2014/11/04 15:30:09 UTC

[15/18] git commit: Merge branch 'master' into misc6

Merge branch 'master' into misc6


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e7712656
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e7712656
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e7712656

Branch: refs/heads/master
Commit: e7712656b8504bb3ae736dc3e55b8ffc8d102728
Parents: 35fd634 b18b189
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Nov 4 11:11:31 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Nov 4 11:11:31 2014 +0000

----------------------------------------------------------------------
 .../brooklyn/catalog/internal/CatalogDo.java    | 14 ++++----
 .../brooklyn/catalog/internal/CatalogDto.java   | 34 +++++++++++++++++++-
 .../catalog/internal/CatalogLoadTest.java       |  4 +--
 3 files changed, 41 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e7712656/core/src/main/java/brooklyn/catalog/internal/CatalogDo.java
----------------------------------------------------------------------