Merge branch 'APEXMALHAR-2096'
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/127ffe75 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/127ffe75 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/127ffe75 Branch: refs/heads/master Commit: 127ffe75226abcf91aa5234713ca5f99bc76c46f Parents: a14b487 703ff06 Author: Chandni Singh <[email protected]> Authored: Tue May 31 18:57:29 2016 -0700 Committer: Chandni Singh <[email protected]> Committed: Tue May 31 18:57:29 2016 -0700 ---------------------------------------------------------------------- .../lib/io/fs/AbstractFileSplitter.java | 17 +++++++---- .../datatorrent/lib/io/fs/FSInputModule.java | 31 +++++++++++++++++--- .../lib/io/fs/FSInputModuleAppTest.java | 1 + .../lib/io/fs/FileSplitterBaseTest.java | 5 +++- .../lib/io/fs/FileSplitterInputTest.java | 1 + 5 files changed, 45 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
