You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by cr...@apache.org on 2017/12/15 22:05:45 UTC
[1/2] incubator-airflow git commit: [AIRFLOW-1525] Fix minor LICENSE
and NOTICE issues
Repository: incubator-airflow
Updated Branches:
refs/heads/v1-9-stable 604e6a780 -> 8457b0036
[AIRFLOW-1525] Fix minor LICENSE and NOTICE issues
Closes #2884 from criccomini/AIRFLOW-1525
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/78540974
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/78540974
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/78540974
Branch: refs/heads/v1-9-stable
Commit: 78540974cc459aa73c6f6de13dcfbd872b0b0885
Parents: 604e6a7
Author: Chris Riccomini <cr...@apache.org>
Authored: Fri Dec 15 13:58:54 2017 -0800
Committer: Chris Riccomini <cr...@apache.org>
Committed: Fri Dec 15 14:04:52 2017 -0800
----------------------------------------------------------------------
LICENSE | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/78540974/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 19ba93f..d468094 100644
--- a/LICENSE
+++ b/LICENSE
@@ -224,7 +224,8 @@ The text of each license is also included at licenses/LICENSE-[project]-[version
(MIT License) Clock Plugin (https://github.com/Lwangaman/jQuery-Clock-Plugin)
(MIT License) WebGL-2D (https://github.com/gameclosure/webgl-2d)
(MIT License) Underscore.js (http://underscorejs.org)
-
+ (MIT License) Bootstrap Toggle (http://www.bootstraptoggle.com)
+ (MIT License) normalize.css (http://git.io/normalize)
========================================================================
BSD 2-Clause licenses
@@ -236,3 +237,5 @@ The text of each license is also included at licenses/LICENSE-[project]-[version
(BSD 2 License) flask-kerberos (https://github.com/mkomitee/flask-kerberos)
(BSD 2 License) Ace (https://github.com/ajaxorg/ace)
(BSD 2 License) d3js (https://d3js.org)
+ (BSD 3 License) parallel.js (https://parallel.js.org/)
+
[2/2] incubator-airflow git commit: [AIRFLOW-XXX] Bump version to
1.9.0+incubating
Posted by cr...@apache.org.
[AIRFLOW-XXX] Bump version to 1.9.0+incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/8457b003
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/8457b003
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/8457b003
Branch: refs/heads/v1-9-stable
Commit: 8457b0036939c75c967d4750a55e4513f98546a1
Parents: 7854097
Author: Chris Riccomini <cr...@apache.org>
Authored: Fri Dec 15 14:05:17 2017 -0800
Committer: Chris Riccomini <cr...@apache.org>
Committed: Fri Dec 15 14:05:17 2017 -0800
----------------------------------------------------------------------
airflow/version.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/8457b003/airflow/version.py
----------------------------------------------------------------------
diff --git a/airflow/version.py b/airflow/version.py
index 2eddb9e..cbd7901 100644
--- a/airflow/version.py
+++ b/airflow/version.py
@@ -13,4 +13,4 @@
# limitations under the License.
#
-version = '1.9.0'
+version = '1.9.0+incubating'