ACCUMULO-145 ACCUMULO-405 merged to trunk

git-svn-id: https://svn.apache.org/repos/asf/incubator/accumulo/trunk/src/examples/wikisearch@1296504 13f79535-47bb-0310-9956-ffa450edef68
tree: 4138cec6f2f3be6d68b757d58b9d3fc9ae893adf
  1. ingest/
  2. query/
  3. query-war/
  4. pom.xml
  5. README
  6. README.parallel