You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/08/21 16:09:59 UTC
[3/9] git commit: Merge branch 'master' of
https://github.com/apache/incubator-usergrid into USERGRID-42
Merge branch 'master' of https://github.com/apache/incubator-usergrid into USERGRID-42
Conflicts:
stack/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/97cdb051
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/97cdb051
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/97cdb051
Branch: refs/heads/master
Commit: 97cdb0510ec05ae367b7e3ea05bb9f7c247e04b8
Parents: 053693a b73a3ac
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Authored: Wed Aug 20 21:52:44 2014 -0700
Committer: Lewis John McGibbney <le...@jpl.nasa.gov>
Committed: Wed Aug 20 21:52:44 2014 -0700
----------------------------------------------------------------------
portal/tests/protractor-ignore/profile.spec.js | 77 +++++++++++++++++++++
portal/tests/protractor/profile.spec.js | 77 ---------------------
portal/tests/protractor/util.js | 4 +-
portal/tests/protractorConf.js | 4 +-
stack/build-tools/pom.xml | 2 +-
stack/config/pom.xml | 2 +-
stack/core/pom.xml | 2 +-
stack/launcher/pom.xml | 2 +-
stack/mongo-emulator/pom.xml | 2 +-
stack/pom.xml | 6 ++
stack/query-validator/pom.xml | 2 +-
stack/rest/pom.xml | 4 +-
stack/services/pom.xml | 2 +-
stack/test-utils/pom.xml | 2 +-
stack/tools/pom.xml | 4 +-
stack/websocket/pom.xml | 2 +-
16 files changed, 100 insertions(+), 94 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/97cdb051/stack/pom.xml
----------------------------------------------------------------------
diff --cc stack/pom.xml
index 9d72851,d468545..48b7887
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@@ -27,9 -27,9 +27,15 @@@
<groupId>org.apache.usergrid</groupId>
<artifactId>usergrid</artifactId>
++<<<<<<< HEAD
+ <version>0.0.29-SNAPSHOT</version>
+ <name>Usergrid Parent </name>
+ <description>Parent module for the Apache Usergrid Project</description>
++=======
+ <version>0.0.29</version>
+ <name>Usergrid Parent</name>
+ <description>Usergrid Project</description>
++>>>>>>> b73a3acace06cdccd2857e2475e6ad6e74f2d197
<packaging>pom</packaging>
<properties>