ACCUMULO-446 ACCUMULO-447 ACCUMULO-460: merge to trunk

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