You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2014/06/07 17:35:17 UTC
[2/2] git commit: Merge pull request #1458 from
ahgittin/fix-catalog-rebind-intermittent-error
Merge pull request #1458 from ahgittin/fix-catalog-rebind-intermittent-error
block in catalog if someone tries to add something early
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/15cd1e8b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/15cd1e8b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/15cd1e8b
Branch: refs/heads/master
Commit: 15cd1e8bbcc4e5200e0dbfceb3bbeed82b655474
Parents: 8a66aac 70ce131
Author: Aled Sage <al...@gmail.com>
Authored: Sat Jun 7 16:30:35 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Sat Jun 7 16:30:35 2014 +0100
----------------------------------------------------------------------
.../catalog/internal/BasicBrooklynCatalog.java | 22 ++++++++++++++++++--
.../catalog/internal/CatalogClasspathDo.java | 2 +-
.../brooklyn/catalog/internal/CatalogDo.java | 18 ++++++++++++++++
.../entity/rebind/RebindCatalogEntityTest.java | 6 ++++++
4 files changed, 45 insertions(+), 3 deletions(-)
----------------------------------------------------------------------