Merge b23340ba2fecc7b7276c3fbf570ba23f91a9a387 into 48a34e414bee3918ceff23c65481ab22d4a2859c
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/167be7a7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/167be7a7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/167be7a7 Branch: refs/pull/1410/merge Commit: 167be7a78b96b102c31af5e7f0e8b1e0600be60d Parents: 48a34e4 b23340b Author: Sam Corbett <sam.corb...@cloudsoftcorp.com> Authored: Fri May 23 14:41:36 2014 +0000 Committer: Sam Corbett <sam.corb...@cloudsoftcorp.com> Committed: Fri May 23 14:41:36 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(-) ----------------------------------------------------------------------
