apex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vro...@apache.org
Subject [05/29] incubator-apex-core git commit: Merge branch 'APEX-159' of https://github.com/vrozov/incubator-apex-core into APEX-159
Date Sun, 11 Oct 2015 16:05:20 GMT
Merge branch 'APEX-159' of https://github.com/vrozov/incubator-apex-core into APEX-159

Conflicts:
	engine/src/test/java/com/datatorrent/stram/StramMiniClusterTest.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/8e49cfb1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/8e49cfb1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/8e49cfb1

Branch: refs/heads/feature-module
Commit: 8e49cfb1a9f1ccd818016ad6f169ebfde0256775
Parents: fb53705 0fc22a0
Author: Thomas Weise <thomas@datatorrent.com>
Authored: Sun Sep 27 17:28:45 2015 -0700
Committer: Thomas Weise <thomas@datatorrent.com>
Committed: Sun Sep 27 17:28:45 2015 -0700

----------------------------------------------------------------------
 .../stram/LaunchContainerRunnable.java          | 27 +++++++-------------
 .../java/com/datatorrent/stram/StramClient.java | 10 +-------
 2 files changed, 10 insertions(+), 27 deletions(-)
----------------------------------------------------------------------



Mime
View raw message