ACCUMULO-2169 Update CHANGES.
ACCUMULO-2169 Remove Wikisearch commits from CHANGES
ACCUMULO-2169 Replace 1.4.5-SNAPSHOT with 1.4.5

find . -type f -not -path './.git/*' -exec sed -i 's/1.4.5-SNAPSHOT/1.4.5/' {} \;
ACCUMULO-1897 removes unneeded constructor for MemKeyConversionIterator.

Signed-off-by: Mike Drob <mdrob@cloudera.com>
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2617 Fix the locationByProgram to account for the extra 'bin' directory
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-1395 Generate example configuration

Signed-off-by: Christopher Tubbs <ctubbsii@apache.org>
ACCUMULO-2169 Replace 1.4.5 with 1.4.6-SNAPSHOT

find . -type f -not -path './.git/*' -exec sed -i 's/1[.]4[.]5/1.4.6-SNAPSHOT/' {} \;
Merge branch '1.4.6-SNAPSHOT' into 1.5.2-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT'

Conflicts:
	conf/examples/1GB/native-standalone/accumulo-env.sh
	conf/examples/2GB/native-standalone/accumulo-env.sh
	conf/examples/2GB/standalone/accumulo-env.sh
	conf/examples/3GB/native-standalone/accumulo-env.sh
	conf/examples/3GB/standalone/accumulo-env.sh
	conf/examples/512MB/native-standalone/accumulo-env.sh
	conf/examples/512MB/standalone/accumulo-env.sh
Revert "ACCUMULO-1395 Generate example configuration"

This reverts commit d137a4f9e49ca05c4967ac3ed09ba3e3206b2ec6.
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2433 Use IteratorSetting instead of config to avoid ZK issues. Fix loop variable usage.
ACCUMULO-2433 Ensure that we wait for teh constraint update to propagate to the tserver

This test has the potential to fail because of how `createtable -evc` is implemented.
It sets a zk property which the tserver hosting the tablet for the given table must
notice that the property changed so that it enforces the constraint.
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2636 Fix globbing in python test

Funtional test was using globbing and picked up the sources jar instead of the compiled jar.