You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ab...@apache.org on 2017/03/31 22:44:58 UTC

[4/4] geode git commit: Merge branch 'release/1.1.1'

Merge branch 'release/1.1.1'


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/3254fd5d
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/3254fd5d
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/3254fd5d

Branch: refs/heads/master
Commit: 3254fd5da57259ce868d7fd7658f665bf9e4a448
Parents: 7f0f4d5 e208104
Author: Anthony Baker <ab...@apache.org>
Authored: Fri Mar 31 15:06:44 2017 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Fri Mar 31 15:06:44 2017 -0700

----------------------------------------------------------------------
 .../tools/pulse/PulseVerificationTest.java      | 168 ++++++
 .../tools/pulse/internal/data/Cluster.java      |   4 +-
 .../pulse/internal/data/JMXDataUpdater.java     |  46 +-
 .../tools/pulse/internal/data/Repository.java   |   3 +
 geode-pulse/src/main/webapp/DataBrowser.html    | 345 -----------
 geode-pulse/src/main/webapp/Login.html          | 114 ----
 geode-pulse/src/main/webapp/MemberDetails.html  | 603 -------------------
 .../src/main/webapp/QueryStatistics.html        | 308 ----------
 .../src/main/webapp/WEB-INF/spring-security.xml |  21 +-
 geode-pulse/src/main/webapp/dataBrowser.html    | 345 +++++++++++
 geode-pulse/src/main/webapp/index.html          |   2 +-
 geode-pulse/src/main/webapp/login.html          | 114 ++++
 geode-pulse/src/main/webapp/memberDetails.html  | 603 +++++++++++++++++++
 .../src/main/webapp/queryStatistics.html        | 308 ++++++++++
 .../src/main/webapp/scripts/lib/common.js       |   4 +-
 .../webapp/scripts/pulsescript/MemberDetails.js |   2 +-
 .../scripts/pulsescript/PulseCallbacks.js       |   2 +-
 .../webapp/scripts/pulsescript/clusterDetail.js |  12 +-
 .../scripts/pulsescript/clusterRGraphMembers.js |   6 +-
 .../main/webapp/scripts/pulsescript/common.js   |   2 +-
 .../scripts/pulsescript/pages/DataBrowser.js    |   2 +-
 .../pulsescript/pages/DataBrowserQuery.js       |   2 +-
 .../pages/DataBrowserQueryHistory.js            |   2 +-
 .../webapp/scripts/pulsescript/regionView.js    |   4 +-
 .../tools/pulse/tests/rules/WebDriverRule.java  |   3 +-
 .../pulse/tests/ui/PulseAnonymousUserTest.java  |   2 +-
 gradle.properties                               |   2 +-
 27 files changed, 1594 insertions(+), 1435 deletions(-)
----------------------------------------------------------------------