client revision
Merge branch 'master' of https://github.com/faclc4/YCSB

Conflicts:
	src/com/yahoo/ycsb/workloads/File_CoreWorkload.java
post mortem changes
Merge branch 'master' of https://github.com/faclc4/YCSB

Conflicts:
	README.md
	bin/ycsb.sh
	file_workloads/workload_1
	src/main/java/com/yahoo/ycsb/BasicDB.java
	src/main/java/com/yahoo/ycsb/ByteArrayByteIterator.java
	src/main/java/com/yahoo/ycsb/ByteIterator.java
	src/main/java/com/yahoo/ycsb/Client.java
	src/main/java/com/yahoo/ycsb/CommandLine.java
	src/main/java/com/yahoo/ycsb/CommandLine.java-backup
	src/main/java/com/yahoo/ycsb/DB.java
	src/main/java/com/yahoo/ycsb/DBException.java
	src/main/java/com/yahoo/ycsb/DBFactory.java
	src/main/java/com/yahoo/ycsb/DBWrapper.java
	src/main/java/com/yahoo/ycsb/InfinispanGlue.java
	src/main/java/com/yahoo/ycsb/InputStreamByteIterator.java
	src/main/java/com/yahoo/ycsb/Pair.java
	src/main/java/com/yahoo/ycsb/RandomByteIterator.java
	src/main/java/com/yahoo/ycsb/StringByteIterator.java
	src/main/java/com/yahoo/ycsb/TerminatorThread.java
	src/main/java/com/yahoo/ycsb/UnknownDBException.java
	src/main/java/com/yahoo/ycsb/Utils.java
	src/main/java/com/yahoo/ycsb/Workload.java
	src/main/java/com/yahoo/ycsb/WorkloadException.java
	src/main/java/com/yahoo/ycsb/generator/ConstantIntegerGenerator.java
	src/main/java/com/yahoo/ycsb/generator/CounterGenerator.java
	src/main/java/com/yahoo/ycsb/generator/DiscreteGenerator.java
	src/main/java/com/yahoo/ycsb/generator/ExponentialGenerator.java
	src/main/java/com/yahoo/ycsb/generator/FileGenerator.java
	src/main/java/com/yahoo/ycsb/generator/Generator.java
	src/main/java/com/yahoo/ycsb/generator/HistogramGenerator.java
	src/main/java/com/yahoo/ycsb/generator/HotspotIntegerGenerator.java
	src/main/java/com/yahoo/ycsb/generator/IntegerGenerator.java
	src/main/java/com/yahoo/ycsb/generator/ScrambledZipfianGenerator.java
	src/main/java/com/yahoo/ycsb/generator/SkewedLatestGenerator.java
	src/main/java/com/yahoo/ycsb/generator/UniformGenerator.java
	src/main/java/com/yahoo/ycsb/generator/UniformIntegerGenerator.java
	src/main/java/com/yahoo/ycsb/generator/ZipfianGenerator.java
	src/main/java/com/yahoo/ycsb/measurements/Measurements.java
	src/main/java/com/yahoo/ycsb/measurements/OneMeasurement.java
	src/main/java/com/yahoo/ycsb/measurements/OneMeasurementHistogram.java
	src/main/java/com/yahoo/ycsb/measurements/OneMeasurementTimeSeries.java
	src/main/java/com/yahoo/ycsb/measurements/ResultHandler.java
	src/main/java/com/yahoo/ycsb/measurements/ResultStorage.java
	src/main/java/com/yahoo/ycsb/measurements/exporter/JSONMeasurementsExporter.java
	src/main/java/com/yahoo/ycsb/measurements/exporter/MeasurementsExporter.java
	src/main/java/com/yahoo/ycsb/measurements/exporter/TextMeasurementsExporter.java
	src/main/java/com/yahoo/ycsb/workloads/File_CoreWorkload.java
post-mortem mods