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/26 12:38:29 UTC

[1/2] ignite git commit: IGNITE-843 mongoose-local version.

Repository: ignite
Updated Branches:
  refs/heads/ignite-843 3ba81456e -> 5f895e5d1


IGNITE-843 mongoose-local version.


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

Branch: refs/heads/ignite-843
Commit: ebe6a9e87380e0968a256e78c088fa789c82e64e
Parents: 90dbd9c
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Aug 26 17:38:23 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Aug 26 17:38:23 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/ebe6a9e8/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 bf2cd17..9bb9573 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.2",
+    "passport-local-mongoose": "^1.0.1",
     "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/5f895e5d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5f895e5d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5f895e5d

Branch: refs/heads/ignite-843
Commit: 5f895e5d17b2b20ead5d8101dcbc7e0e27523915
Parents: ebe6a9e 3ba8145
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Aug 26 17:38:53 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Aug 26 17:38:53 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/routes/agent.js                 |  15 ++
 .../cache/query/GridCacheQueryManager.java      |  22 +--
 .../cache/query/GridCacheSqlIndexMetadata.java  |   8 +-
 .../cache/query/GridCacheSqlMetadata.java       |  16 +--
 .../jdbc/GridCacheQueryJdbcMetadataTask.java    |  10 +-
 .../IgniteCacheAbstractFieldsQuerySelfTest.java |  14 +-
 .../http/jetty/GridJettyJsonConfig.java         | 142 +++++++++++++++----
 7 files changed, 168 insertions(+), 59 deletions(-)
----------------------------------------------------------------------