Merge branch 'release/0.10.0' into develop
Conflicts:
NOTICE.txt
docs/manual/data/versions.yml
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/ba954045
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/ba954045
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/ba954045
Branch: refs/heads/develop
Commit: ba95404582d5f725bb31fed8429d345dbec0c1cd
Parents: 2f196da 237e17a
Author: Donald Szeto <[email protected]>
Authored: Fri Oct 7 15:15:08 2016 -0700
Committer: Donald Szeto <[email protected]>
Committed: Fri Oct 7 15:15:08 2016 -0700
----------------------------------------------------------------------
.travis.yml | 24 +-
DISCLAIMER | 7 +
LICENSE.txt | 35 +-
NOTICE.txt | 2 +-
bin/semver.sh | 35 +-
build.sbt | 35 +-
common/build.sbt | 5 +-
common/src/main/resources/META-INF/LICENSE.txt | 1 +
common/src/main/resources/META-INF/NOTICE.txt | 1 +
core/build.sbt | 4 +-
core/src/main/resources/META-INF/LICENSE.txt | 1 +
core/src/main/resources/META-INF/NOTICE.txt | 1 +
.../css/bootstrap-theme.css | 442 -
.../css/bootstrap-theme.css.map | 1 -
.../css/bootstrap-theme.min.css | 5 -
.../bootstrap-3.2.0-dist/css/bootstrap.css | 6203 ----------
.../bootstrap-3.2.0-dist/css/bootstrap.css.map | 1 -
.../bootstrap-3.2.0-dist/css/bootstrap.min.css | 5 -
.../fonts/glyphicons-halflings-regular.eot | Bin 20335 -> 0 bytes
.../fonts/glyphicons-halflings-regular.svg | 229 -
.../fonts/glyphicons-halflings-regular.ttf | Bin 41280 -> 0 bytes
.../fonts/glyphicons-halflings-regular.woff | Bin 23320 -> 0 bytes
.../assets/bootstrap-3.2.0-dist/js/bootstrap.js | 2114 ----
.../bootstrap-3.2.0-dist/js/bootstrap.min.js | 6 -
.../predictionio/workflow/index.scala.html | 2 +-
data/build.sbt | 6 +-
data/src/main/resources/META-INF/LICENSE.txt | 1 +
data/src/main/resources/META-INF/NOTICE.txt | 1 +
.../data/storage/hbase/HBPEvents.scala | 13 +-
.../data/storage/hbase/PIOHBaseUtil.scala | 15 +-
docs/manual/.gitignore | 3 +
docs/manual/bower.json | 14 +-
.../bower_components/Slidebars/.bower.json | 17 -
.../manual/bower_components/Slidebars/README.md | 107 -
.../bower_components/Slidebars/bower.json | 7 -
.../Slidebars/development/readme.txt | 1 -
.../Slidebars/development/slidebars.css | 219 -
.../Slidebars/development/slidebars.js | 356 -
.../Slidebars/distribution/0.10.1/slidebars.css | 213 -
.../Slidebars/distribution/0.10.1/slidebars.js | 346 -
.../distribution/0.10.1/slidebars.min.css | 2 -
.../distribution/0.10.1/slidebars.min.js | 2 -
.../Slidebars/distribution/0.10.2/slidebars.css | 208 -
.../Slidebars/distribution/0.10.2/slidebars.js | 346 -
.../distribution/0.10.2/slidebars.min.css | 2 -
.../distribution/0.10.2/slidebars.min.js | 2 -
.../Slidebars/distribution/0.10/slidebars.css | 207 -
.../Slidebars/distribution/0.10/slidebars.js | 349 -
.../distribution/0.10/slidebars.min.css | 2 -
.../distribution/0.10/slidebars.min.js | 2 -
.../Slidebars/distribution/0.7.1/slidebars.css | 130 -
.../Slidebars/distribution/0.7.1/slidebars.js | 271 -
.../distribution/0.7.1/slidebars.min.css | 2 -
.../distribution/0.7.1/slidebars.min.js | 2 -
.../Slidebars/distribution/0.7/slidebars.css | 121 -
.../Slidebars/distribution/0.7/slidebars.js | 358 -
.../distribution/0.7/slidebars.min.css | 2 -
.../Slidebars/distribution/0.7/slidebars.min.js | 2 -
.../Slidebars/distribution/0.8.1/slidebars.css | 139 -
.../Slidebars/distribution/0.8.1/slidebars.js | 284 -
.../distribution/0.8.1/slidebars.min.css | 2 -
.../distribution/0.8.1/slidebars.min.js | 2 -
.../Slidebars/distribution/0.8.2/slidebars.css | 141 -
.../Slidebars/distribution/0.8.2/slidebars.js | 294 -
.../distribution/0.8.2/slidebars.min.css | 2 -
.../distribution/0.8.2/slidebars.min.js | 2 -
.../Slidebars/distribution/0.8/slidebars.css | 139 -
.../Slidebars/distribution/0.8/slidebars.js | 284 -
.../distribution/0.8/slidebars.min.css | 2 -
.../Slidebars/distribution/0.8/slidebars.min.js | 2 -
.../Slidebars/distribution/0.9.4/slidebars.css | 195 -
.../Slidebars/distribution/0.9.4/slidebars.js | 328 -
.../distribution/0.9.4/slidebars.min.css | 2 -
.../distribution/0.9.4/slidebars.min.js | 2 -
.../Slidebars/distribution/0.9/slidebars.css | 196 -
.../Slidebars/distribution/0.9/slidebars.js | 328 -
.../distribution/0.9/slidebars.min.css | 2 -
.../Slidebars/distribution/0.9/slidebars.min.js | 2 -
.../Slidebars/examples/animation-styles.html | 66 -
.../Slidebars/examples/api-usage.html | 144 -
.../Slidebars/examples/basic-template.html | 37 -
.../Slidebars/examples/control-classes.html | 64 -
.../Slidebars/examples/custom-widths.html | 65 -
.../Slidebars/examples/example-styles.css | 46 -
.../Slidebars/examples/fixed-positions.html | 97 -
.../Slidebars/examples/left-slidebar-only.html | 60 -
.../Slidebars/examples/mobile-only.html | 68 -
.../Slidebars/examples/momentum-scrolling.html | 72 -
.../Slidebars/examples/optional-widths.html | 64 -
.../Slidebars/examples/right-slidebar-only.html | 60 -
.../Slidebars/examples/scroll-lock.html | 96 -
.../Slidebars/examples/slidebar-links.html | 77 -
.../Slidebars/examples/slidebars/slidebars.css | 207 -
.../Slidebars/examples/slidebars/slidebars.js | 349 -
.../Slidebars/examples/static-slidebars.html | 92 -
.../bower_components/Slidebars/license.txt | 21 -
.../Slidebars/slidebars.jquery.json | 35 -
.../manual/bower_components/Tabslet/.bower.json | 26 -
docs/manual/bower_components/Tabslet/.gitignore | 10 -
.../manual/bower_components/Tabslet/LICENSE.txt | 202 -
docs/manual/bower_components/Tabslet/README.md | 54 -
docs/manual/bower_components/Tabslet/bower.json | 17 -
.../bower_components/Tabslet/demo/favicon.ico | Bin 1150 -> 0 bytes
.../Tabslet/demo/images/tabslet.png | Bin 17022 -> 0 bytes
.../Tabslet/demo/images/tabslet_logo.png | Bin 944 -> 0 bytes
.../images/tabslet_logo_single_color_150.png | Bin 2939 -> 0 bytes
.../bower_components/Tabslet/demo/index.html | 278 -
.../Tabslet/demo/javascripts/initializers.js | 43 -
.../demo/javascripts/vendor/jquery-1.9.1.min.js | 5 -
.../demo/javascripts/vendor/jquery.anchor.js | 39 -
.../javascripts/vendor/jquery.tabslet.min.js | 25 -
.../demo/javascripts/vendor/modernizr.custom.js | 4 -
.../javascripts/vendor/rainbow-custom.min.js | 10 -
.../javascripts/vendor/waypoints-sticky.min.js | 8 -
.../demo/javascripts/vendor/waypoints.min.js | 8 -
.../Tabslet/demo/stylesheets/github.css | 88 -
.../Tabslet/demo/stylesheets/reset.css | 118 -
.../Tabslet/demo/stylesheets/styles.css | 295 -
.../Tabslet/demo/stylesheets/typography.css | 258 -
.../bower_components/Tabslet/jquery.tabslet.js | 181 -
.../Tabslet/jquery.tabslet.min.js | 25 -
.../bower_components/Tabslet/package.json | 25 -
.../Tabslet/tabslet.jquery.json | 37 -
.../bower_components/Tabslet/test/index.html | 58 -
.../Tabslet/test/jquery.tabslet.test.js | 19 -
.../bower_components/jcarousel/.bower.json | 19 -
.../bower_components/jcarousel/CHANGELOG.md | 166 -
.../bower_components/jcarousel/CONTRIBUTING.md | 35 -
docs/manual/bower_components/jcarousel/LICENSE | 22 -
.../manual/bower_components/jcarousel/README.md | 65 -
.../bower_components/jcarousel/bower.json | 8 -
.../bower_components/jcarousel/component.json | 41 -
.../bower_components/jcarousel/dist/README.md | 64 -
.../dist/jquery.jcarousel-autoscroll.js | 59 -
.../dist/jquery.jcarousel-autoscroll.min.js | 4 -
.../jcarousel/dist/jquery.jcarousel-control.js | 76 -
.../dist/jquery.jcarousel-control.min.js | 4 -
.../jcarousel/dist/jquery.jcarousel-core.js | 1026 --
.../jcarousel/dist/jquery.jcarousel-core.min.js | 4 -
.../dist/jquery.jcarousel-pagination.js | 203 -
.../dist/jquery.jcarousel-pagination.min.js | 4 -
.../dist/jquery.jcarousel-scrollintoview.js | 63 -
.../dist/jquery.jcarousel-scrollintoview.min.js | 4 -
.../jcarousel/dist/jquery.jcarousel.js | 1419 ---
.../jcarousel/dist/jquery.jcarousel.min.js | 4 -
.../bower_components/jcarousel/docs/README.md | 27 -
.../docs/cookbook/custom-start-position.md | 42 -
.../docs/cookbook/responsive-carousel.md | 56 -
.../jcarousel/docs/plugins/README.md | 12 -
.../jcarousel/docs/plugins/autoscroll/README.md | 13 -
.../docs/plugins/autoscroll/reference/api.md | 92 -
.../autoscroll/reference/configuration.md | 69 -
.../docs/plugins/autoscroll/reference/events.md | 110 -
.../autoscroll/reference/installation.md | 23 -
.../jcarousel/docs/plugins/control/README.md | 15 -
.../docs/plugins/control/reference/api.md | 53 -
.../plugins/control/reference/configuration.md | 109 -
.../docs/plugins/control/reference/events.md | 153 -
.../plugins/control/reference/installation.md | 70 -
.../jcarousel/docs/plugins/pagination/README.md | 12 -
.../docs/plugins/pagination/reference/api.md | 72 -
.../pagination/reference/configuration.md | 82 -
.../docs/plugins/pagination/reference/events.md | 166 -
.../pagination/reference/installation.md | 68 -
.../docs/plugins/scrollintoview/README.md | 36 -
.../jcarousel/docs/reference/api.md | 323 -
.../jcarousel/docs/reference/configuration.md | 248 -
.../jcarousel/docs/reference/events.md | 365 -
.../jcarousel/docs/reference/installation.md | 119 -
.../jcarousel/docs/reference/usage.md | 217 -
.../jcarousel/examples/README.md | 13 -
.../jcarousel/examples/_shared/css/style.css | 49 -
.../jcarousel/examples/_shared/img/img1.jpg | Bin 62881 -> 0 bytes
.../examples/_shared/img/img1_thumb.jpg | Bin 4907 -> 0 bytes
.../jcarousel/examples/_shared/img/img2.jpg | Bin 55540 -> 0 bytes
.../examples/_shared/img/img2_thumb.jpg | Bin 4728 -> 0 bytes
.../jcarousel/examples/_shared/img/img3.jpg | Bin 33319 -> 0 bytes
.../examples/_shared/img/img3_thumb.jpg | Bin 4047 -> 0 bytes
.../jcarousel/examples/_shared/img/img4.jpg | Bin 70135 -> 0 bytes
.../examples/_shared/img/img4_thumb.jpg | Bin 5130 -> 0 bytes
.../jcarousel/examples/_shared/img/img5.jpg | Bin 65136 -> 0 bytes
.../examples/_shared/img/img5_thumb.jpg | Bin 5004 -> 0 bytes
.../jcarousel/examples/_shared/img/img6.jpg | Bin 41186 -> 0 bytes
.../examples/_shared/img/img6_thumb.jpg | Bin 4428 -> 0 bytes
.../jcarousel/examples/ajax/data.json | 28 -
.../jcarousel/examples/ajax/index.html | 38 -
.../jcarousel/examples/ajax/jcarousel.ajax.css | 88 -
.../jcarousel/examples/ajax/jcarousel.ajax.js | 47 -
.../jcarousel/examples/basic/index.html | 52 -
.../examples/basic/jcarousel.basic.css | 122 -
.../jcarousel/examples/basic/jcarousel.basic.js | 36 -
.../examples/connected-carousels/index.html | 63 -
.../jcarousel.connected-carousels.css | 187 -
.../jcarousel.connected-carousels.js | 84 -
.../examples/data-attributes/index.html | 48 -
.../jcarousel.data-attributes.css | 82 -
.../jcarousel.data-attributes.js | 13 -
.../jcarousel/examples/responsive/index.html | 48 -
.../responsive/jcarousel.responsive.css | 117 -
.../examples/responsive/jcarousel.responsive.js | 49 -
.../jcarousel/examples/skeleton/index.html | 55 -
.../examples/skeleton/jcarousel.skeleton.css | 34 -
.../examples/skeleton/jcarousel.skeleton.js | 55 -
.../jcarousel/examples/transitions/index.html | 53 -
.../transitions/jcarousel.transitions.css | 83 -
.../transitions/jcarousel.transitions.js | 20 -
.../jcarousel/libs/jquery-loader.js | 33 -
.../jcarousel/libs/jquery/jquery.js | 10308 -----------------
.../jcarousel/libs/modernizr/modernizr.js | 287 -
.../bower_components/jcarousel/package.json | 45 -
.../jcarousel/src/autoscroll.js | 63 -
.../bower_components/jcarousel/src/control.js | 80 -
.../bower_components/jcarousel/src/core.js | 229 -
.../jcarousel/src/core_plugin.js | 802 --
.../jcarousel/src/pagination.js | 207 -
.../jcarousel/src/scrollintoview.js | 67 -
.../jcarousel/test/functional/animation.html | 126 -
.../test/functional/autoscroll/default.html | 135 -
.../jcarousel/test/functional/center.html | 114 -
.../test/functional/control/default.html | 73 -
.../test/functional/control/event.html | 145 -
.../jcarousel/test/functional/dynamic.html | 112 -
.../jcarousel/test/functional/event.html | 116 -
.../jcarousel/test/functional/focus.html | 80 -
.../jcarousel/test/functional/hidden.html | 83 -
.../test/functional/pagination/default.html | 158 -
.../jcarousel/test/functional/plugin.html | 98 -
.../test/functional/scrollintoview/default.html | 95 -
.../jcarousel/test/functional/start.html | 158 -
.../jcarousel/test/functional/transitions.html | 124 -
.../jcarousel/test/functional/wrap.html | 215 -
.../jcarousel/test/horizontal.css | 32 -
.../jcarousel/test/vertical.css | 32 -
docs/manual/bower_components/jquery/.bower.json | 37 -
.../bower_components/jquery/MIT-LICENSE.txt | 21 -
docs/manual/bower_components/jquery/bower.json | 27 -
.../bower_components/jquery/dist/jquery.js | 9205 ---------------
.../bower_components/jquery/dist/jquery.min.js | 5 -
.../bower_components/jquery/dist/jquery.min.map | 1 -
docs/manual/bower_components/jquery/src/ajax.js | 786 --
.../bower_components/jquery/src/ajax/jsonp.js | 89 -
.../bower_components/jquery/src/ajax/load.js | 75 -
.../jquery/src/ajax/parseJSON.js | 13 -
.../jquery/src/ajax/parseXML.js | 28 -
.../bower_components/jquery/src/ajax/script.js | 64 -
.../jquery/src/ajax/var/nonce.js | 5 -
.../jquery/src/ajax/var/rquery.js | 3 -
.../bower_components/jquery/src/ajax/xhr.js | 136 -
.../bower_components/jquery/src/attributes.js | 11 -
.../jquery/src/attributes/attr.js | 141 -
.../jquery/src/attributes/classes.js | 158 -
.../jquery/src/attributes/prop.js | 94 -
.../jquery/src/attributes/support.js | 35 -
.../jquery/src/attributes/val.js | 161 -
.../bower_components/jquery/src/callbacks.js | 205 -
docs/manual/bower_components/jquery/src/core.js | 497 -
.../bower_components/jquery/src/core/access.js | 60 -
.../bower_components/jquery/src/core/init.js | 123 -
.../jquery/src/core/parseHTML.js | 39 -
.../bower_components/jquery/src/core/ready.js | 97 -
.../jquery/src/core/var/rsingleTag.js | 4 -
docs/manual/bower_components/jquery/src/css.js | 450 -
.../jquery/src/css/addGetHookIf.js | 22 -
.../bower_components/jquery/src/css/curCSS.js | 57 -
.../jquery/src/css/defaultDisplay.js | 70 -
.../jquery/src/css/hiddenVisibleSelectors.js | 15 -
.../bower_components/jquery/src/css/support.js | 96 -
.../bower_components/jquery/src/css/swap.js | 28 -
.../jquery/src/css/var/cssExpand.js | 3 -
.../jquery/src/css/var/getStyles.js | 12 -
.../jquery/src/css/var/isHidden.js | 13 -
.../jquery/src/css/var/rmargin.js | 3 -
.../jquery/src/css/var/rnumnonpx.js | 5 -
docs/manual/bower_components/jquery/src/data.js | 178 -
.../bower_components/jquery/src/data/Data.js | 181 -
.../bower_components/jquery/src/data/accepts.js | 20 -
.../jquery/src/data/var/data_priv.js | 5 -
.../jquery/src/data/var/data_user.js | 5 -
.../bower_components/jquery/src/deferred.js | 149 -
.../bower_components/jquery/src/deprecated.js | 13 -
.../bower_components/jquery/src/dimensions.js | 50 -
.../bower_components/jquery/src/effects.js | 648 --
.../jquery/src/effects/Tween.js | 114 -
.../jquery/src/effects/animatedSelector.js | 13 -
.../manual/bower_components/jquery/src/event.js | 868 --
.../bower_components/jquery/src/event/ajax.js | 13 -
.../bower_components/jquery/src/event/alias.js | 39 -
.../jquery/src/event/support.js | 9 -
.../bower_components/jquery/src/exports/amd.js | 24 -
.../jquery/src/exports/global.js | 32 -
.../manual/bower_components/jquery/src/intro.js | 44 -
.../bower_components/jquery/src/jquery.js | 37 -
.../bower_components/jquery/src/manipulation.js | 580 -
.../jquery/src/manipulation/_evalUrl.js | 18 -
.../jquery/src/manipulation/support.js | 32 -
.../src/manipulation/var/rcheckableType.js | 3 -
.../bower_components/jquery/src/offset.js | 207 -
.../manual/bower_components/jquery/src/outro.js | 1 -
.../manual/bower_components/jquery/src/queue.js | 142 -
.../bower_components/jquery/src/queue/delay.js | 22 -
.../jquery/src/selector-native.js | 172 -
.../jquery/src/selector-sizzle.js | 14 -
.../bower_components/jquery/src/selector.js | 1 -
.../bower_components/jquery/src/serialize.js | 111 -
.../jquery/src/sizzle/dist/sizzle.js | 2067 ----
.../jquery/src/sizzle/dist/sizzle.min.js | 3 -
.../jquery/src/sizzle/dist/sizzle.min.map | 1 -
.../bower_components/jquery/src/traversing.js | 199 -
.../jquery/src/traversing/findFilter.js | 100 -
.../jquery/src/traversing/var/rneedsContext.js | 6 -
.../bower_components/jquery/src/var/arr.js | 3 -
.../jquery/src/var/class2type.js | 4 -
.../bower_components/jquery/src/var/concat.js | 5 -
.../bower_components/jquery/src/var/hasOwn.js | 5 -
.../bower_components/jquery/src/var/indexOf.js | 5 -
.../bower_components/jquery/src/var/pnum.js | 3 -
.../bower_components/jquery/src/var/push.js | 5 -
.../jquery/src/var/rnotwhite.js | 3 -
.../bower_components/jquery/src/var/slice.js | 5 -
.../jquery/src/var/strundefined.js | 3 -
.../bower_components/jquery/src/var/support.js | 4 -
.../bower_components/jquery/src/var/toString.js | 5 -
docs/manual/bower_components/jquery/src/wrap.js | 79 -
.../bower_components/normalize.css/.bower.json | 23 -
.../bower_components/normalize.css/LICENSE.md | 19 -
.../bower_components/normalize.css/README.md | 90 -
.../bower_components/normalize.css/bower.json | 13 -
.../normalize.css/normalize.css | 424 -
docs/manual/data/versions.yml | 2 +-
.../community/contribute-documentation.html.md | 10 +-
.../logos/downloads/banner-dark-background.eps | 1287 --
.../logos/downloads/banner-dark-background.svg | 43 -
.../logos/downloads/banner-light-background.eps | 1317 ---
.../logos/downloads/banner-light-background.png | Bin 22195 -> 0 bytes
.../logos/downloads/banner-light-background.svg | 48 -
.../logos/downloads/frog-dark-background.eps | 886 --
.../logos/downloads/frog-dark-background.png | Bin 17890 -> 0 bytes
.../logos/downloads/frog-dark-background.svg | 23 -
.../logos/downloads/frog-light-background.eps | 916 --
.../logos/downloads/frog-light-background.png | Bin 21104 -> 0 bytes
.../logos/downloads/frog-light-background.svg | 28 -
.../logos/downloads/predictionio-logo.sketch | Bin 286720 -> 0 bytes
docs/manual/source/javascripts/application.js | 21 +-
docs/manual/source/javascripts/tryit.js | 27 +-
e2/build.sbt | 4 +-
e2/src/main/resources/META-INF/LICENSE.txt | 1 +
e2/src/main/resources/META-INF/NOTICE.txt | 1 +
make-distribution.sh | 2 +-
project/Build.scala | 3 +
tests/.rat-excludes | 1 +
tests/README.md | 4 +-
tests/docker-files/init.sh | 2 +-
.../engines/recommendation-engine/build.sbt | 6 +-
tests/run_docker.sh | 2 +-
tools/build.sbt | 11 +-
tools/src/main/resources/META-INF/LICENSE.txt | 1 +
tools/src/main/resources/META-INF/NOTICE.txt | 1 +
.../css/bootstrap-theme.css | 442 -
.../css/bootstrap-theme.css.map | 1 -
.../css/bootstrap-theme.min.css | 5 -
.../bootstrap-3.2.0-dist/css/bootstrap.css | 6203 ----------
.../bootstrap-3.2.0-dist/css/bootstrap.css.map | 1 -
.../bootstrap-3.2.0-dist/css/bootstrap.min.css | 5 -
.../fonts/glyphicons-halflings-regular.eot | Bin 20335 -> 0 bytes
.../fonts/glyphicons-halflings-regular.svg | 229 -
.../fonts/glyphicons-halflings-regular.ttf | Bin 41280 -> 0 bytes
.../fonts/glyphicons-halflings-regular.woff | Bin 23320 -> 0 bytes
.../assets/bootstrap-3.2.0-dist/js/bootstrap.js | 2114 ----
.../bootstrap-3.2.0-dist/js/bootstrap.min.js | 6 -
.../main/resources/assets/jquery-1.11.1.min.js | 4 -
.../tools/dashboard/index.scala.html | 6 +-
371 files changed, 189 insertions(+), 72899 deletions(-)
----------------------------------------------------------------------
