You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@heron.apache.org by hu...@apache.org on 2018/07/07 02:10:10 UTC
[incubator-heron] 01/01: Merge branch 'master' of
https://github.com/apache/incubator-heron into huijunw/aurorametadata
This is an automated email from the ASF dual-hosted git repository.
huijun pushed a commit to branch huijunw/aurorametadata
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
commit 5452eb2b68976e1569f92fd190554e2aefcd2358
Merge: 07ab700 ae50ff3
Author: Huijun Wu <hu...@twitter.com>
AuthorDate: Fri Jul 6 19:04:52 2018 -0700
Merge branch 'master' of https://github.com/apache/incubator-heron into huijunw/aurorametadata
.travis.yml | 6 +-
WORKSPACE | 2 +-
deploy/kubernetes/helm/templates/tools.yaml | 19 +
deploy/kubernetes/helm/values.yaml.template | 12 +
docker/compile/Dockerfile.centos7 | 2 +-
docker/compile/Dockerfile.debian8 | 2 +-
docker/compile/Dockerfile.ubuntu14.04 | 2 +-
docker/compile/Dockerfile.ubuntu15.10 | 2 +-
docker/compile/Dockerfile.ubuntu16.04 | 2 +-
.../api/StatefulTumblingWindowTopology.java | 181 +++++++
.../src/java/org/apache/heron/api/utils/Utils.java | 7 +
.../heron/api/windowing/EvictionContext.java | 4 +-
.../impl/groupings/JoinCustomGrouping.java | 5 +-
.../ReduceByKeyAndWindowCustomGrouping.java | 6 +-
.../impl/groupings/RemapCustomGrouping.java | 3 +-
heron/api/tests/java/BUILD | 3 +-
.../java/org/apache/heron/api/utils/UtilsTest.java | 42 ++
heron/config/src/yaml/conf/local/healthmgr.yaml | 29 +-
heron/config/src/yaml/conf/sandbox/healthmgr.yaml | 29 +-
heron/config/src/yaml/conf/yarn/healthmgr.yaml | 24 +-
.../org/apache/heron/healthmgr/HealthManager.java | 9 +-
.../apache/heron/healthmgr/HealthPolicyConfig.java | 22 +-
.../heron/healthmgr/HealthPolicyConfigReader.java | 3 +-
.../healthmgr/common/PhysicalPlanProvider.java | 6 +-
.../AutoRestartBackpressureContainerPolicy.java | 17 +-
.../policy/DynamicResourceAllocationPolicy.java | 4 +-
.../heron/healthmgr/policy/ToggleablePolicy.java | 135 +++++
.../heron/simulator/grouping/FieldsGrouping.java | 6 +-
heron/stmgr/src/cpp/manager/instance-server.cpp | 44 ++
heron/stmgr/src/cpp/manager/instance-server.h | 9 +
heron/tmaster/src/cpp/BUILD | 1 +
heron/tmaster/src/cpp/manager/tcontroller.cpp | 38 ++
heron/tmaster/src/cpp/manager/tcontroller.h | 1 +
heron/tools/cli/src/python/submit.py | 4 +-
heron/tools/tracker/src/python/tracker.py | 10 +
heron/tools/tracker/tests/python/BUILD | 2 +-
.../tools/tracker/tests/python/tracker_unittest.py | 19 +
heron/tools/ui/resources/static/js/config.js | 53 +-
heronpy/api/tests/python/serializer_unittest.py | 3 +-
heronpy/api/topology.py | 50 +-
integration_test/src/java/BUILD | 65 ++-
.../common/AbstractTestTopology.java | 93 ++++
.../common/BasicConfig.java | 45 ++
.../BasicTopologyOneTask.java | 51 ++
.../BasicTopologyOneTaskResults.json | 59 +++
.../BasicTopologyOneTask.java | 51 ++
.../BasicTopologyOneTaskResults.json | 71 +++
.../BasicTopologyOneTask.java | 51 ++
.../BasicTopologyOneTaskResults.json | 65 +++
.../topology/fields_grouping/FieldsGrouping.java | 54 ++
.../fields_grouping/FieldsGroupingResults.json | 84 +++
.../src/python/topology_test_runner/BUILD | 19 +
.../src/python/topology_test_runner/main.py | 568 +++++++++++++++++++++
.../topology_test_runner/resources/test.json | 52 ++
scripts/packages/BUILD | 18 +-
scripts/packages/heronpy/requirements.txt | 1 +
scripts/packages/heronpy/setup.py.template | 3 +
scripts/packages/tests_template_bin.sh | 9 +-
scripts/release/release.sh | 4 +-
scripts/run_integration_topology_test.sh | 51 ++
scripts/travis/test.sh | 12 +
vagrant/init.sh | 2 +-
website/README.md | 9 +-
website/config.yaml | 6 +-
website/content/docs/contributors/community.md | 5 +-
website/content/docs/contributors/governance.md | 28 +-
.../content/docs/developers/compiling/docker.md | 2 +-
website/content/docs/developers/compiling/linux.md | 4 +-
website/content/docs/developers/python/bolts.md | 48 +-
website/content/docs/developers/python/spouts.md | 29 +-
.../content/docs/developers/python/topologies.md | 140 ++---
.../docs/developers/scala/streamlet-api.mmark | 24 +-
.../deployment/schedulers/kubernetes-helm.md | 15 +
website/scripts/python-doc-gen.sh | 11 +-
74 files changed, 2310 insertions(+), 257 deletions(-)