Merge remote-tracking branch 'origin/STREAMS-187'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/d88e8c88 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/d88e8c88 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/d88e8c88 Branch: refs/heads/master Commit: d88e8c8896442d7f7b537f5159f6619e7a0f0a6c Parents: 42d0ab3 8088ac9 Author: Ryan Ebanks <[email protected]> Authored: Fri Oct 31 09:46:35 2014 -0500 Committer: Ryan Ebanks <[email protected]> Committed: Fri Oct 31 09:46:35 2014 -0500 ---------------------------------------------------------------------- streams-contrib/streams-amazon-aws/pom.xml | 2 +- .../org/apache/streams/s3/S3Configurator.java | 55 +++++++++----------- .../org/apache/streams/s3/S3PersistReader.java | 11 ++-- .../org/apache/streams/s3/S3PersistWriter.java | 10 ++-- .../org/apache/streams/s3/S3Configuration.json | 18 +++++-- 5 files changed, 55 insertions(+), 41 deletions(-) ----------------------------------------------------------------------
