Repository: kylin
Updated Branches:
  refs/heads/2.0-rc 8d3516ed3 -> 2d6584ed1


minor, upgrade angularjs to 1.2.29


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

Branch: refs/heads/2.0-rc
Commit: 2d6584ed13650c189e04f59f6d6ade5ea33799dd
Parents: 8d3516e
Author: jian <zhongj...@apache.org>
Authored: Tue Jan 19 21:50:42 2016 +0800
Committer: jian <zhongj...@apache.org>
Committed: Tue Jan 19 21:50:42 2016 +0800

----------------------------------------------------------------------
 webapp/bower.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/2d6584ed/webapp/bower.json
----------------------------------------------------------------------
diff --git a/webapp/bower.json b/webapp/bower.json
index 475ff0b..41144f9 100755
--- a/webapp/bower.json
+++ b/webapp/bower.json
@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "dependencies": {
     "angular-bootstrap": "0.10.0",
-    "angular": "1.2.15",
+    "angular": "1.2.29",
     "angular-resource": "~1.3.12",
     "angular-route": "1.2.15",
     "ng-grid": "2.0.11",
@@ -39,7 +39,7 @@
     "angular-mocks-unstable": "~1.1.5"
   },
   "resolutions": {
-    "angular": "1.2.15",
+    "angular": "1.2.29",
     "nvd3": "1.1.15-beta",
     "d3": "3.4.4",
     "moment": "2.4.0",

Reply via email to