You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/31 03:39:32 UTC
[1/3] git commit: Fixes bug with missing environment variables in
REST tier
Repository: incubator-usergrid
Updated Branches:
refs/heads/key-row-sharding ef4ede29b -> c02e77eef
Fixes bug with missing environment variables in REST tier
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/0bc8b5d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/0bc8b5d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/0bc8b5d3
Branch: refs/heads/key-row-sharding
Commit: 0bc8b5d30a649f3223c84532be8780f11e48bb47
Parents: 4aab84f
Author: Todd Nine <tn...@apigee.com>
Authored: Thu Oct 30 18:53:20 2014 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Thu Oct 30 18:53:20 2014 -0600
----------------------------------------------------------------------
stack/awscluster/ugcluster-cf.json | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0bc8b5d3/stack/awscluster/ugcluster-cf.json
----------------------------------------------------------------------
diff --git a/stack/awscluster/ugcluster-cf.json b/stack/awscluster/ugcluster-cf.json
index 0e5570d..17d07f8 100644
--- a/stack/awscluster/ugcluster-cf.json
+++ b/stack/awscluster/ugcluster-cf.json
@@ -856,6 +856,9 @@
"\n",
"export CASSANDRA_REPLICATION_FACTOR=", { "Ref":"CassReplicationFactor" }, "\n",
"\n",
+ "export ES_CLUSTER_NAME=", { "Ref":"ESClusterName" }, "\n",
+ "export ES_NUM_SERVERS=", { "Ref":"ESNumServers" }, "\n",
+ "\n",
"export RELEASE_BUCKET=", { "Ref":"ReleaseBucket" }, "\n",
"\n",
"export SUPER_USER_EMAIL=", { "Ref":"SuperUserEmail" }, "\n",
[3/3] git commit: Merge branch 'key-row-sharding' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
key-row-sharding
Posted by to...@apache.org.
Merge branch 'key-row-sharding' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into key-row-sharding
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c02e77ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c02e77ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c02e77ee
Branch: refs/heads/key-row-sharding
Commit: c02e77eef5316d0b220c51efacf99add9bda6fef
Parents: a5137ca ef4ede2
Author: Todd Nine <tn...@apigee.com>
Authored: Thu Oct 30 20:39:14 2014 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Thu Oct 30 20:39:14 2014 -0600
----------------------------------------------------------------------
.../loadtests/src/test/resources/logback-test.xml | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c02e77ee/stack/loadtests/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --cc stack/loadtests/src/test/resources/logback-test.xml
index 6a188ab,d98b728..e1528ca
--- a/stack/loadtests/src/test/resources/logback-test.xml
+++ b/stack/loadtests/src/test/resources/logback-test.xml
@@@ -1,23 -1,20 +1,38 @@@
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
<configuration>
-
+ <!--/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */ -->
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%-5level] %logger{15} - %msg%n%rEx</pattern>
[2/3] git commit: Fixes logging in test framework
Posted by to...@apache.org.
Fixes logging in test framework
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a5137cad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a5137cad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a5137cad
Branch: refs/heads/key-row-sharding
Commit: a5137cad58c4b997a4d0f7132fa1db1629f7e3a5
Parents: 0bc8b5d
Author: Todd Nine <tn...@apigee.com>
Authored: Thu Oct 30 20:38:12 2014 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Thu Oct 30 20:38:12 2014 -0600
----------------------------------------------------------------------
.../loadtests/src/test/resources/logback-test.xml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a5137cad/stack/loadtests/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/test/resources/logback-test.xml b/stack/loadtests/src/test/resources/logback-test.xml
index d15f9f4..6a188ab 100644
--- a/stack/loadtests/src/test/resources/logback-test.xml
+++ b/stack/loadtests/src/test/resources/logback-test.xml
@@ -1,3 +1,21 @@
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">