Merge remote-tracking branch 'public/master'
Conflicts:
bigtop-tests/test-artifacts/longevity/src/main/groovy/org/apache/bigtop/itest/iolongevity/TestSLive.groovy
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/208b6935
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/208b6935
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/208b6935
Branch: refs/heads/master
Commit: 208b6935f801c815f99f18646da430895495def8
Parents: 6731122 b91629c
Author: Konstantin Boudnik <[email protected]>
Authored: Fri Feb 21 10:30:38 2014 -0800
Committer: Konstantin Boudnik <[email protected]>
Committed: Fri Feb 21 10:30:38 2014 -0800
----------------------------------------------------------------------
.../bigtop/itest/iolongevity/TestSLive.groovy | 151 +++++++++++++------
bigtop-tests/test-execution/README | 7 +-
2 files changed, 113 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
