You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by ro...@apache.org on 2014/11/12 22:47:28 UTC
[1/3] incubator-usergrid git commit: USERGRID-247 Default config.js
setup. Added extra gitignore files.
Repository: incubator-usergrid
Updated Branches:
refs/heads/master a89c57b89 -> ae9677800
USERGRID-247 Default config.js setup. Added extra gitignore files.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/80803faf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/80803faf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/80803faf
Branch: refs/heads/master
Commit: 80803faf4cb64fd13c8c81c4659a857b9ffdffc8
Parents: 7131c5a
Author: John D. Ament <jo...@apache.org>
Authored: Tue Nov 11 20:41:38 2014 -0500
Committer: John D. Ament <jo...@apache.org>
Committed: Tue Nov 11 20:41:38 2014 -0500
----------------------------------------------------------------------
.gitignore | 3 ++-
portal/config.js | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/80803faf/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 47ed041..2ed09aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,8 +27,9 @@ Icon
/portal/test/coverage/instrument/js/usergrid-coverage.min.js
/portal/test/coverage/instrument/js/usergrid.min.js
/stack/corepersistence/priamcluster/aws.properties
-#Webstorm artifacts
+#Webstorm/IntelliJ artifacts
.idea/
+*.iml
stack/corepersistence/collection/nbactions.xml
stack/corepersistence/graph/nbactions.xml
stack/corepersistence/model/nbactions.xml
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/80803faf/portal/config.js
----------------------------------------------------------------------
diff --git a/portal/config.js b/portal/config.js
index e04ba9d..ebc9e7e 100644
--- a/portal/config.js
+++ b/portal/config.js
@@ -24,7 +24,7 @@ Usergrid.showNotifcations = true;
// used only if hostname does not match a real server name
-Usergrid.overrideUrl = 'https://api.usergrid.com/';
+Usergrid.overrideUrl = 'http://localhost:8080/';
Usergrid.options = {
client:{
[2/3] incubator-usergrid git commit: USERGRID-246 Set version back to
1.0.1-SNAPSHOT
Posted by ro...@apache.org.
USERGRID-246 Set version back to 1.0.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/93bff8bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/93bff8bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/93bff8bc
Branch: refs/heads/master
Commit: 93bff8bc68888d121faccca7f5a85b1e7c9b395e
Parents: 80803fa
Author: John D. Ament <jo...@apache.org>
Authored: Tue Nov 11 20:46:08 2014 -0500
Committer: John D. Ament <jo...@apache.org>
Committed: Tue Nov 11 20:46:08 2014 -0500
----------------------------------------------------------------------
stack/build-tools/pom.xml | 2 +-
stack/config/pom.xml | 2 +-
stack/core/pom.xml | 2 +-
stack/java-sdk-old/pom.xml | 2 +-
stack/launcher/pom.xml | 2 +-
stack/mongo-emulator/pom.xml | 2 +-
stack/pom.xml | 2 +-
stack/rest/pom.xml | 2 +-
stack/services/pom.xml | 2 +-
stack/test-utils/pom.xml | 2 +-
stack/tools/pom.xml | 2 +-
stack/websocket/pom.xml | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/93bff8bc/stack/build-tools/pom.xml
----------------------------------------------------------------------
diff --git a/stack/build-tools/pom.xml b/stack/build-tools/pom.xml
index fdefdb5..07bfc76 100644
--- a/stack/build-tools/pom.xml
+++ b/stack/build-tools/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.usergrid</groupId>
<artifactId>usergrid</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/93bff8bc/stack/config/pom.xml
----------------------------------------------------------------------
diff --git a/stack/config/pom.xml b/stack/config/pom.xml
index 44636b3..7c7105f 100644
--- a/stack/config/pom.xml
+++ b/stack/config/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.usergrid</groupId>
<artifactId>usergrid</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/93bff8bc/stack/core/pom.xml
----------------------------------------------------------------------
diff --git a/stack/core/pom.xml b/stack/core/pom.xml
index df764c7..d3e3e4e 100644
--- a/stack/core/pom.xml
+++ b/stack/core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.usergrid</groupId>
<artifactId>usergrid</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/93bff8bc/stack/java-sdk-old/pom.xml
----------------------------------------------------------------------
diff --git a/stack/java-sdk-old/pom.xml b/stack/java-sdk-old/pom.xml
index 8c998a0..faa4b88 100644
--- a/stack/java-sdk-old/pom.xml
+++ b/stack/java-sdk-old/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.usergrid</groupId>
<artifactId>usergrid</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/93bff8bc/stack/launcher/pom.xml
----------------------------------------------------------------------
diff --git a/stack/launcher/pom.xml b/stack/launcher/pom.xml
index 2d87631..cf41a08 100644
--- a/stack/launcher/pom.xml
+++ b/stack/launcher/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.usergrid</groupId>
<artifactId>usergrid</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/93bff8bc/stack/mongo-emulator/pom.xml
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/pom.xml b/stack/mongo-emulator/pom.xml
index a787d89..7f03b61 100644
--- a/stack/mongo-emulator/pom.xml
+++ b/stack/mongo-emulator/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.usergrid</groupId>
<artifactId>usergrid</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/93bff8bc/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 843b72f..1c3c60b 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -27,7 +27,7 @@
<groupId>org.apache.usergrid</groupId>
<artifactId>usergrid</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<name>Usergrid Parent</name>
<description>Parent module for the Apache Usergrid Project</description>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/93bff8bc/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index cadf14b..998572e 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.usergrid</groupId>
<artifactId>usergrid</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/93bff8bc/stack/services/pom.xml
----------------------------------------------------------------------
diff --git a/stack/services/pom.xml b/stack/services/pom.xml
index 1a387f4..6c9c868 100644
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.usergrid</groupId>
<artifactId>usergrid</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/93bff8bc/stack/test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/stack/test-utils/pom.xml b/stack/test-utils/pom.xml
index 961ac2f..daa9f98 100644
--- a/stack/test-utils/pom.xml
+++ b/stack/test-utils/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.usergrid</groupId>
<artifactId>usergrid</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/93bff8bc/stack/tools/pom.xml
----------------------------------------------------------------------
diff --git a/stack/tools/pom.xml b/stack/tools/pom.xml
index 71e12bf..0fac833 100644
--- a/stack/tools/pom.xml
+++ b/stack/tools/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.usergrid</groupId>
<artifactId>usergrid</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/93bff8bc/stack/websocket/pom.xml
----------------------------------------------------------------------
diff --git a/stack/websocket/pom.xml b/stack/websocket/pom.xml
index 6e46819..64f4515 100644
--- a/stack/websocket/pom.xml
+++ b/stack/websocket/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.usergrid</groupId>
<artifactId>usergrid</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
[3/3] incubator-usergrid git commit: Merge remote-tracking branch
'johnament/USERGRID-246' into apache_usergrid/master
Posted by ro...@apache.org.
Merge remote-tracking branch 'johnament/USERGRID-246' into apache_usergrid/master
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ae967780
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ae967780
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ae967780
Branch: refs/heads/master
Commit: ae96778002cf1dc5979f0d67cceff76050d487a5
Parents: a89c57b 93bff8b
Author: Rod Simpson <ro...@apigee.com>
Authored: Wed Nov 12 14:46:06 2014 -0700
Committer: Rod Simpson <ro...@apigee.com>
Committed: Wed Nov 12 14:46:06 2014 -0700
----------------------------------------------------------------------
.gitignore | 3 ++-
portal/config.js | 2 +-
stack/build-tools/pom.xml | 2 +-
stack/config/pom.xml | 2 +-
stack/core/pom.xml | 2 +-
stack/java-sdk-old/pom.xml | 2 +-
stack/launcher/pom.xml | 2 +-
stack/mongo-emulator/pom.xml | 2 +-
stack/pom.xml | 2 +-
stack/rest/pom.xml | 2 +-
stack/services/pom.xml | 2 +-
stack/test-utils/pom.xml | 2 +-
stack/tools/pom.xml | 2 +-
stack/websocket/pom.xml | 2 +-
14 files changed, 15 insertions(+), 14 deletions(-)
----------------------------------------------------------------------