Merge b23340ba2fecc7b7276c3fbf570ba23f91a9a387 into 1c9ae9245088e6904c4ed66ec1f592e2588e6f8e
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/8179824f Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/8179824f Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/8179824f Branch: refs/pull/1410/merge Commit: 8179824f7de86b863154957c1ba5e992e41d4fca Parents: 1c9ae92 b23340b Author: Sam Corbett <sam.corb...@cloudsoftcorp.com> Authored: Fri May 23 16:21:20 2014 +0000 Committer: Sam Corbett <sam.corb...@cloudsoftcorp.com> Committed: Fri May 23 16:21:20 2014 +0000 ---------------------------------------------------------------------- .../entity/basic/BrooklynConfigKeys.java | 10 +++--- usage/jsgui/build/gzip-with-redirect.sh | 23 -------------- usage/jsgui/pom.xml | 32 +++++++++----------- .../main/webapp/assets/js/view/googlemaps.js | 6 ++-- 4 files changed, 22 insertions(+), 49 deletions(-) ----------------------------------------------------------------------
