[3/7] brooklyn-server git commit: pom: remove commons-beanutils version conflict

pom: remove commons-beanutils version conflict camp-brooklyn depended on 1.9.1. parent pom declared 1.9.3. Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/bab742a1 Tree: http://git-wip-us.apache.org/repos/a

[2/7] brooklyn-server git commit: tidy pom.xml

tidy pom.xml Groups and comments dependencies more sensibly, but does not change/add/remove any of those dependencies. Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/bb86fe38 Tree: http://git-wip-us.apach

[7/7] brooklyn-server git commit: This closes #998

This closes #998 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e27cc7b6 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e27cc7b6 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ser

[5/7] brooklyn-server git commit: pom: bump gson to 2.5, to match jclouds

pom: bump gson to 2.5, to match jclouds Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/57f5da6b Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/57f5da6b Diff: http://git-wip-us.apache.org/

[4/7] brooklyn-server git commit: pom: bump felix-framework version to match Kara 4.1.6

pom: bump felix-framework version to match Kara 4.1.6 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/fdc7d82f Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/fdc7d82f Diff: http://git-wip-

[1/7] brooklyn-server git commit: Add testMergeMapsPreferringSecondOnConflict

Repository: brooklyn-server Updated Branches: refs/heads/master 2ec309b96 -> e27cc7b6d Add testMergeMapsPreferringSecondOnConflict Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/71bf99b0 Tree: http://g

[6/7] brooklyn-server git commit: This closes #997

This closes #997 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/9b859d7a Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/9b859d7a Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ser

[1/3] brooklyn-server git commit: LogWatcher don't change log level if not needed

Repository: brooklyn-server Updated Branches: refs/heads/master 176977124 -> 2ec309b96 LogWatcher don't change log level if not needed prevents the logs from missing useful output if testing for a higher-level message, useful when investigating tests. also use try-close syntax for LogWatcher

[2/3] brooklyn-server git commit: remove system.out

remove system.out Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/39782e67 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/39782e67 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-se

[3/3] brooklyn-server git commit: This closes #989

This closes #989 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/2ec309b9 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/2ec309b9 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ser