commit cd4915a9ee4ee9ff5a50a0d5bd28f3b164934427
author Dave Johnson <snoopdave@apache.org> Fri Aug 29 17:35:50 2014 -0400
committer Dave Johnson <snoopdave@apache.org> Fri Aug 29 17:35:50 2014 -0400
tree 466fffa38b515e28fb428524da870145d9f323ad
parent 676520c587839058032db1d355e27ac23626dc8c
parent b6100f3ef5cadf5e3ceddd85139a3e00255431d5

Merge branch 'pr/73'.  This closes #73

Conflicts:
	.gitignore

.gitignore

diff --git a/.gitignore b/.gitignore
index 2dc1df4..b0a497d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,5 @@
 
 /portal/js/generated-templates/
 /release/target/
+
+/portal/seleniumLog.txt

portal/Gruntfile.js

diff --git a/portal/Gruntfile.js b/portal/Gruntfile.js
index 1dfdfbe..f768b61 100644
--- a/portal/Gruntfile.js
+++ b/portal/Gruntfile.js
@@ -382,10 +382,6 @@
   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']);
 
 };