Merge branch 'apache-blur-0.2' of https://git-wip-us.apache.org/repos/asf/incubator-blur into apache-blur-0.2
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/76bdd4f5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/76bdd4f5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/76bdd4f5 Branch: refs/heads/apache-blur-0.2 Commit: 76bdd4f5967785c859b234383a21572739f08872 Parents: ea01b94 d9e844c Author: Aaron McCurry <[email protected]> Authored: Tue Jun 17 13:42:59 2014 -0400 Committer: Aaron McCurry <[email protected]> Committed: Tue Jun 17 13:42:59 2014 -0400 ---------------------------------------------------------------------- contrib/blur-console/pom.xml | 8 ++ contrib/blur-console/src/assemble/bin.xml | 24 +--- .../src/main/resources/checkstyle.xml | 115 +++++++++++++++++++ .../blur-console/src/main/resources/log4j.xml | 2 +- contrib/blur-console/src/main/webapp/.gitignore | 4 +- .../blur-console/src/main/webapp/Gruntfile.js | 111 ++++++++++++++++-- contrib/blur-console/src/main/webapp/banner | 16 +++ contrib/blur-console/src/main/webapp/index.html | 34 +----- .../src/main/webapp/js/blurconsole.overrides.js | 62 ---------- .../blur-console/src/main/webapp/package.json | 6 +- .../src/main/webapp/sass/blurconsole.scss | 3 +- pom.xml | 5 +- 12 files changed, 255 insertions(+), 135 deletions(-) ----------------------------------------------------------------------
