Merge release-0.8.9 branch into master

Change-Id: Id4353716267d45ce21580ac2856e6a751d05d1f8


Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/f1bd7840
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/f1bd7840
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/f1bd7840

Branch: refs/heads/master
Commit: f1bd7840dc4bf090b262fbd1650d2374ca95bbdf
Parents: 6e6a80c 3b462e1
Author: Ian Maxon <ima...@apache.org>
Authored: Mon Jan 23 15:20:34 2017 -0800
Committer: Ian Maxon <ima...@apache.org>
Committed: Mon Jan 23 15:20:34 2017 -0800

----------------------------------------------------------------------
 asterixdb/LICENSE                               |   9 +
 asterixdb/asterix-active/pom.xml                |   2 +-
 asterixdb/asterix-algebra/pom.xml               |   2 +-
 asterixdb/asterix-app/pom.xml                   |   6 +-
 asterixdb/asterix-client-helper/pom.xml         |   8 +-
 asterixdb/asterix-common/pom.xml                |   2 +-
 .../common/config/PropertiesAccessor.java       |  11 +-
 asterixdb/asterix-coverage/pom.xml              |   2 +-
 asterixdb/asterix-doc/pom.xml                   |  11 +-
 asterixdb/asterix-events/pom.xml                |   2 +-
 asterixdb/asterix-examples/pom.xml              |   2 +-
 asterixdb/asterix-experiments/pom.xml           |   2 +-
 asterixdb/asterix-external-data/pom.xml         |   2 +-
 asterixdb/asterix-fuzzyjoin/pom.xml             |   2 +-
 asterixdb/asterix-hivecompat/pom.xml            |   2 +-
 .../main/appended-resources/META-INF/LICENSE    |   9 +
 asterixdb/asterix-installer/pom.xml             |   9 +-
 asterixdb/asterix-lang-aql/pom.xml              |   2 +-
 asterixdb/asterix-lang-common/pom.xml           |   2 +-
 asterixdb/asterix-lang-sqlpp/pom.xml            |   2 +-
 asterixdb/asterix-license/pom.xml               |  13 +-
 .../pom.xml                                     |   2 +-
 .../pom.xml                                     |   2 +-
 .../pom.xml                                     |   2 +-
 .../lexer-generator-maven-plugin/pom.xml        |   2 +-
 asterixdb/asterix-maven-plugins/pom.xml         |   2 +-
 .../pom.xml                                     |   2 +-
 asterixdb/asterix-metadata/pom.xml              |   2 +-
 asterixdb/asterix-om/pom.xml                    |   2 +-
 asterixdb/asterix-replication/pom.xml           |   2 +-
 asterixdb/asterix-runtime/pom.xml               |   2 +-
 asterixdb/asterix-server/pom.xml                |   9 +-
 .../src/main/samples/local/conf/blue.conf       |  17 ++
 .../src/main/samples/local/conf/cc.conf         |  17 ++
 .../test/resources/NCServiceExecutionIT/cc.conf |  17 ++
 .../NCServiceExecutionIT/ncservice1.conf        |  17 ++
 .../NCServiceExecutionIT/ncservice2.conf        |  17 ++
 asterixdb/asterix-test-framework/pom.xml        |   2 +-
 asterixdb/asterix-tools/pom.xml                 |   2 +-
 asterixdb/asterix-transactions/pom.xml          |   2 +-
 asterixdb/asterix-yarn/pom.xml                  |   9 +-
 asterixdb/pom.xml                               |  10 +-
 asterixdb/src/main/assembly/source.xml          |  42 +---
 .../main/licenses/templates/asterix-license.ftl |   7 +-
 .../main/licenses/templates/asterix-notice.ftl  |  47 +++++
 .../hyracks-fullstack_source_licenses.ftl       | 190 +++++++++++++++++++
 .../main/licenses/templates/source_licenses.ftl |   5 +
 .../algebricks/algebricks-common/pom.xml        |   2 +-
 .../algebricks/algebricks-compiler/pom.xml      |   2 +-
 .../algebricks/algebricks-core/pom.xml          |   2 +-
 .../algebricks/algebricks-data/pom.xml          |   2 +-
 .../algebricks-examples/piglet-example/pom.xml  |   2 +-
 .../algebricks/algebricks-examples/pom.xml      |   2 +-
 .../algebricks/algebricks-rewriter/pom.xml      |   2 +-
 .../algebricks/algebricks-runtime/pom.xml       |   2 +-
 .../algebricks/algebricks-tests/pom.xml         |   2 +-
 hyracks-fullstack/algebricks/pom.xml            |   5 +-
 .../hyracks-fullstack-license/pom.xml           |  13 +-
 .../main/licenses/templates/asterix-notice.ftl  |   1 +
 .../main/licenses/templates/source_licenses.ftl |   4 +
 hyracks-fullstack/hyracks/hyracks-api/pom.xml   |   2 +-
 .../hyracks/hyracks-client/pom.xml              |   2 +-
 hyracks-fullstack/hyracks/hyracks-comm/pom.xml  |   2 +-
 .../hyracks-control/hyracks-control-cc/pom.xml  |   2 +-
 .../hyracks-control-common/pom.xml              |   2 +-
 .../hyracks-control/hyracks-control-nc/pom.xml  |   2 +-
 .../hyracks-control/hyracks-nc-service/pom.xml  |   2 +-
 .../hyracks/hyracks-control/pom.xml             |   2 +-
 .../hyracks-data/hyracks-data-std/pom.xml       |   2 +-
 hyracks-fullstack/hyracks/hyracks-data/pom.xml  |   2 +-
 .../hyracks/hyracks-dataflow-common/pom.xml     |   2 +-
 .../hyracks/hyracks-dataflow-std/pom.xml        |   2 +-
 hyracks-fullstack/hyracks/hyracks-dist/pom.xml  |   2 +-
 .../hyracks/hyracks-documentation/pom.xml       |   2 +-
 .../btree-example/btreeclient/pom.xml           |   2 +-
 .../btree-example/btreehelper/pom.xml           |   2 +-
 .../btree-example/btreeserver/pom.xml           |   2 +-
 .../hyracks-examples/btree-example/pom.xml      |   2 +-
 .../hyracks-integration-tests/pom.xml           |   2 +-
 .../hyracks-shutdown-test/pom.xml               |   2 +-
 .../hyracks/hyracks-examples/pom.xml            |   2 +-
 .../hyracks-examples/text-example/pom.xml       |   2 +-
 .../text-example/textclient/pom.xml             |   2 +-
 .../text-example/texthelper/pom.xml             |   2 +-
 .../text-example/textserver/pom.xml             |   2 +-
 .../hyracks-examples/tpch-example/pom.xml       |   2 +-
 .../tpch-example/tpchclient/pom.xml             |   2 +-
 .../tpch-example/tpchserver/pom.xml             |   2 +-
 .../hyracks-hdfs/hyracks-hdfs-1.x/pom.xml       |   2 +-
 .../hyracks-hdfs/hyracks-hdfs-2.x/pom.xml       |   2 +-
 .../hyracks-hdfs/hyracks-hdfs-core/pom.xml      |   4 +-
 hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml  |   2 +-
 hyracks-fullstack/hyracks/hyracks-ipc/pom.xml   |   2 +-
 .../hyracks-virtualcluster-maven-plugin/pom.xml |   2 +-
 .../license-automation-plugin/pom.xml           |   2 +-
 .../hyracks/hyracks-maven-plugins/pom.xml       |   2 +-
 hyracks-fullstack/hyracks/hyracks-net/pom.xml   |   2 +-
 .../hyracks/hyracks-server/pom.xml              |   2 +-
 .../src/test/resources/NCServiceIT/cc.conf      |  17 ++
 .../src/test/resources/NCServiceIT/nc-blue.conf |  17 ++
 .../src/test/resources/NCServiceIT/nc-red.conf  |  17 ++
 .../hyracks-storage-am-bloomfilter/pom.xml      |   2 +-
 .../hyracks/hyracks-storage-am-btree/pom.xml    |   2 +-
 .../hyracks/hyracks-storage-am-common/pom.xml   |   2 +-
 .../hyracks-storage-am-lsm-btree/pom.xml        |   2 +-
 .../hyracks-storage-am-lsm-common/pom.xml       |   2 +-
 .../pom.xml                                     |   2 +-
 .../hyracks-storage-am-lsm-rtree/pom.xml        |   2 +-
 .../hyracks/hyracks-storage-am-rtree/pom.xml    |   2 +-
 .../hyracks/hyracks-storage-common/pom.xml      |   2 +-
 .../hyracks/hyracks-test-support/pom.xml        |   2 +-
 .../hyracks-storage-am-bloomfilter-test/pom.xml |   2 +-
 .../hyracks-storage-am-btree-test/pom.xml       |   2 +-
 .../hyracks-storage-am-lsm-btree-test/pom.xml   |   2 +-
 .../hyracks-storage-am-lsm-common-test/pom.xml  |   2 +-
 .../pom.xml                                     |   2 +-
 .../hyracks-storage-am-lsm-rtree-test/pom.xml   |   2 +-
 .../hyracks-storage-am-rtree-test/pom.xml       |   2 +-
 .../hyracks-storage-common-test/pom.xml         |   2 +-
 hyracks-fullstack/hyracks/hyracks-tests/pom.xml |   2 +-
 hyracks-fullstack/hyracks/hyracks-util/pom.xml  |   2 +-
 hyracks-fullstack/hyracks/pom.xml               |   5 +-
 hyracks-fullstack/pom.xml                       |   6 +-
 pom.xml                                         |   2 +-
 124 files changed, 566 insertions(+), 189 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f1bd7840/asterixdb/asterix-app/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f1bd7840/asterixdb/asterix-client-helper/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f1bd7840/asterixdb/asterix-common/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f1bd7840/asterixdb/asterix-installer/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f1bd7840/asterixdb/asterix-runtime/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f1bd7840/asterixdb/asterix-server/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f1bd7840/asterixdb/asterix-yarn/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f1bd7840/asterixdb/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f1bd7840/hyracks-fullstack/algebricks/algebricks-compiler/pom.xml
----------------------------------------------------------------------

Reply via email to