You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/08/29 23:36:09 UTC
[1/3] git commit: Portal - updated grunt to remove old task types
Repository: incubator-usergrid
Updated Branches:
refs/heads/master 62de58f33 -> cd4915a9e
Portal - updated grunt to remove old task types
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b6100f3e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b6100f3e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b6100f3e
Branch: refs/heads/master
Commit: b6100f3ef5cadf5e3ceddd85139a3e00255431d5
Parents: 6130345
Author: Rod Simpson <ro...@apigee.com>
Authored: Fri Aug 29 12:38:57 2014 -0600
Committer: Rod Simpson <ro...@apigee.com>
Committed: Fri Aug 29 12:38:57 2014 -0600
----------------------------------------------------------------------
.gitignore | 2 ++
portal/Gruntfile.js | 4 ----
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b6100f3e/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 4203d92..df2938f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,5 @@ portal/js/templates.js
/portal/js/generated/
/portal/js/generated-templates/
+
+/portal/seleniumLog.txt
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b6100f3e/portal/Gruntfile.js
----------------------------------------------------------------------
diff --git a/portal/Gruntfile.js b/portal/Gruntfile.js
index 5fa1a68..6d8af6c 100644
--- a/portal/Gruntfile.js
+++ b/portal/Gruntfile.js
@@ -382,10 +382,6 @@ module.exports = function (grunt) {
grunt.registerTask('e2e-coverage', ['clean:coverage', 'connect:e2e-coverage','protractor:coverage']);
grunt.registerTask('e2e-coverage-chrome', ['clean:coverage', 'connect:e2e-coverage-chrome','protractor:chrome', 'makeReport']);
grunt.registerTask('e2e-firefox', ['connect:e2e-firefox','protractor:firefox']);
- grunt.registerTask('e2e-prod', ['protractor:prod']);
- grunt.registerTask('e2e-mars', ['protractor:mars']);
-
-
grunt.registerTask('no-monitoring', ['build','clean:perf','karma:unit']);
};
[2/3] git commit: Revert to launcher AppleJavaExtensions 1.4 so that
at least the launcher will build.
Posted by sn...@apache.org.
Revert to launcher AppleJavaExtensions 1.4 so that at least the launcher will build.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/676520c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/676520c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/676520c5
Branch: refs/heads/master
Commit: 676520c587839058032db1d355e27ac23626dc8c
Parents: 62de58f
Author: Dave Johnson <sn...@apache.org>
Authored: Fri Aug 29 17:33:45 2014 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Fri Aug 29 17:33:45 2014 -0400
----------------------------------------------------------------------
stack/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/676520c5/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index c7cf26d..363efcf 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -1299,7 +1299,7 @@
<groupId>com.apple</groupId>
<artifactId>AppleJavaExtensions</artifactId>
<!-- from local-depedendencies -->
- <version>1.5.4</version>
+ <version>1.4</version>
</dependency>
<dependency>
[3/3] git commit: Merge branch 'pr/73'. This closes #73
Posted by sn...@apache.org.
Merge branch 'pr/73'. This closes #73
Conflicts:
.gitignore
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/cd4915a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/cd4915a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/cd4915a9
Branch: refs/heads/master
Commit: cd4915a9ee4ee9ff5a50a0d5bd28f3b164934427
Parents: 676520c b6100f3
Author: Dave Johnson <sn...@apache.org>
Authored: Fri Aug 29 17:35:50 2014 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Fri Aug 29 17:35:50 2014 -0400
----------------------------------------------------------------------
.gitignore | 2 ++
portal/Gruntfile.js | 4 ----
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cd4915a9/.gitignore
----------------------------------------------------------------------
diff --cc .gitignore
index 2dc1df4,df2938f..b0a497d
--- a/.gitignore
+++ b/.gitignore
@@@ -56,4 -54,5 +56,6 @@@ portal/js/templates.j
/portal/js/generated/
/portal/js/generated-templates/
+/release/target/
+
+ /portal/seleniumLog.txt
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cd4915a9/portal/Gruntfile.js
----------------------------------------------------------------------