tree a2ee51e14e0609f99a0114f427e7a80a072dc404
parent 2933380861606638baf30fa5fbc01e5efbd0d9c9
parent a54265892e6b8346ca580b8534de5866625c2574
author thomas <thomas@datatorrent.com> 1405717688 -0700
committer thomas <thomas@datatorrent.com> 1405717688 -0700

Merge branch 'master' into release-1.0.2

Conflicts:
	contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraTransactionableOutputOperatorPS.java
	library/src/main/java/com/datatorrent/lib/io/fs/AbstractFSDirectoryInputOperator.java