This is an automated email from the ASF dual-hosted git repository.
mmiller pushed a commit to branch 1.8
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 62f88836cb97ebcf4edcbd6ce01633ef4107b887
Merge: 9ac92c7 da10af8
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Fri Jan 19 13:29:58 2018 -0500
Merge branch '1.7' into 1.8
.../accumulo/monitor/servlets/BasicServlet.java | 2 +-
.../src/main/resources/web/flot/excanvas.min.js | 1 -
.../resources/web/flot/jquery.colorhelpers.min.js | 1 -
.../web/flot/jquery.flot.crosshair.min.js | 1 -
.../web/flot/jquery.flot.fillbetween.min.js | 1 -
.../resources/web/flot/jquery.flot.image.min.js | 1 -
.../src/main/resources/web/flot/jquery.flot.min.js | 6 ------
.../resources/web/flot/jquery.flot.navigate.min.js | 1 -
.../main/resources/web/flot/jquery.flot.pie.min.js | 1 -
.../resources/web/flot/jquery.flot.resize.min.js | 1 -
.../web/flot/jquery.flot.selection.min.js | 1 -
.../resources/web/flot/jquery.flot.stack.min.js | 1 -
.../resources/web/flot/jquery.flot.symbol.min.js | 1 -
.../web/flot/jquery.flot.threshold.min.js | 1 -
.../src/main/resources/web/flot/jquery.min.js | 23 ----------------------
15 files changed, 1 insertion(+), 42 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" <commits@accumulo.apache.org>.
