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/09/18 12:32:35 UTC

[8/8] git commit: Merge and close #170

Merge and close #170


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

Branch: refs/heads/master
Commit: 76ffc1962dcddcc8856d97720370764d119027d3
Parents: 5abf177 b6edab1
Author: Richard Downer <ri...@apache.org>
Authored: Thu Sep 18 11:31:44 2014 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Thu Sep 18 11:31:44 2014 +0100

----------------------------------------------------------------------
 usage/jsgui/pom.xml                             |     2 -
 usage/jsgui/src/main/dev/info.txt               |    15 -
 .../src/main/dev/js/libs/jquery.dataTables.js   | 12099 -----------------
 usage/jsgui/src/main/dev/js/libs/jquery.js      |  9404 -------------
 usage/jsgui/src/main/dev/js/libs/moment.js      |  1662 ---
 usage/jsgui/src/main/webapp/assets/js/config.js |     9 +-
 .../jsgui/src/main/webapp/assets/js/libs/URI.js |     2 +-
 .../main/webapp/assets/js/libs/ZeroClipboard.js |     7 +-
 .../webapp/assets/js/libs/brooklyn-utils.js     |   142 -
 .../main/webapp/assets/js/libs/brooklyn-view.js |   350 -
 .../src/main/webapp/assets/js/libs/brooklyn.js  |    48 -
 .../assets/js/libs/dataTables.extensions.js     |     4 +-
 .../assets/js/libs/handlebars-1.0.rc.1.js       |     3 +
 .../webapp/assets/js/libs/jquery.slideto.min.js |     6 +
 .../webapp/assets/js/libs/json-formatter.js     |    90 -
 .../src/main/webapp/assets/js/libs/moment.js    |  1662 +++
 .../main/webapp/assets/js/libs/moment.min.js    |     6 -
 .../main/webapp/assets/js/libs/swagger-ui.js    |     2 +
 .../src/main/webapp/assets/js/libs/swagger.js   |     2 +
 .../webapp/assets/js/util/brooklyn-utils.js     |   163 +
 .../main/webapp/assets/js/util/brooklyn-view.js |   352 +
 .../src/main/webapp/assets/js/util/brooklyn.js  |    69 +
 .../webapp/assets/js/view/add-child-invoke.js   |     4 +-
 usage/jsgui/src/test/javascript/config.txt      |     9 +-
 .../src/test/javascript/specs/library-spec.js   |    12 +-
 25 files changed, 2282 insertions(+), 23842 deletions(-)
----------------------------------------------------------------------