You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by ti...@apache.org on 2015/09/29 21:45:04 UTC
[2/2] incubator-apex-malhar git commit: Merge branch 'MLHR-1824-ram3'
into devel-3
Merge branch 'MLHR-1824-ram3' 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/873667bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/873667bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/873667bc
Branch: refs/heads/devel-3
Commit: 873667bcef8668adbb76ec17454aedfa7ba0221e
Parents: 66a1d58 85ca2e5
Author: Timothy Farkas <ti...@datatorrent.com>
Authored: Tue Sep 29 12:39:47 2015 -0700
Committer: Timothy Farkas <ti...@datatorrent.com>
Committed: Tue Sep 29 12:39:47 2015 -0700
----------------------------------------------------------------------
.../com/datatorrent/demos/pi/Application.java | 53 +-------
.../demos/pi/ApplicationAppData.java | 132 +++++++++++++++++++
.../src/main/resources/META-INF/properties.xml | 22 +++-
3 files changed, 157 insertions(+), 50 deletions(-)
----------------------------------------------------------------------