Merge branch 'devel-3' of https://github.com/davidyan74/incubator-apex-malhar into devel-3
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/40b0c42e Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/40b0c42e Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/40b0c42e Branch: refs/heads/devel-3 Commit: 40b0c42e49db2d1b0c0e6fa000be12e9090f20f1 Parents: 90d5774 3917dc4 Author: Thomas Weise <[email protected]> Authored: Wed Nov 11 19:43:09 2015 -0800 Committer: Thomas Weise <[email protected]> Committed: Wed Nov 11 19:43:09 2015 -0800 ---------------------------------------------------------------------- README.md | 2 +- .../main/resources/com/datatorrent/contrib/apachelog/urls.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
