You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/08/25 18:54:40 UTC

[1/2] ignite git commit: IGNITE-843 update libs

Repository: ignite
Updated Branches:
  refs/heads/ignite-843 0ed91729f -> 6b4f5d8ba


IGNITE-843 update libs


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

Branch: refs/heads/ignite-843
Commit: ba9713f54ed58ecc4348411348ee018e5fa783f7
Parents: 120c11c
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Aug 25 23:54:17 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Aug 25 23:54:17 2015 +0700

----------------------------------------------------------------------
 modules/control-center-web/src/main/js/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/ba9713f5/modules/control-center-web/src/main/js/package.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/package.json b/modules/control-center-web/src/main/js/package.json
index 8330cfe..bf2cd17 100644
--- a/modules/control-center-web/src/main/js/package.json
+++ b/modules/control-center-web/src/main/js/package.json
@@ -38,7 +38,7 @@
     "node-sass-middleware": "^0.9.0",
     "passport": "^0.3.0",
     "passport-local": "^1.0.0",
-    "passport-local-mongoose": "^1.0.0",
+    "passport-local-mongoose": "^1.0.2",
     "nodemailer": "1.4.0",
     "serve-favicon": "~2.3.0",
     "ws": "~0.8.0"


[2/2] ignite git commit: Merge remote-tracking branch 'origin/ignite-843' into ignite-843

Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843' into ignite-843


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

Branch: refs/heads/ignite-843
Commit: 6b4f5d8ba59923da4e4150b63a8feada21ce0a66
Parents: ba9713f 0ed9172
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Aug 25 23:54:33 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Aug 25 23:54:33 2015 +0700

----------------------------------------------------------------------
 .../main/js/controllers/caches-controller.js    |   4 +-
 .../main/js/controllers/metadata-controller.js  |  10 +-
 .../main/js/controllers/models/metadata.json    |   3 +
 .../main/js/routes/generator/generator-xml.js   | 125 +++++++++++--------
 4 files changed, 84 insertions(+), 58 deletions(-)
----------------------------------------------------------------------