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/14 18:41:40 UTC
[09/11] git commit: Merge branch 'master' into two-dot-o. Also making
log configs consistent.
Merge branch 'master' into two-dot-o. Also making log configs consistent.
Conflicts:
.gitignore
portal/dist/usergrid-portal/index-debug.html
portal/dist/usergrid-portal/index-template.html
portal/dist/usergrid-portal/index.html
portal/dist/usergrid-portal/js/libs/usergrid-libs.min.js
portal/dist/usergrid-portal/js/libs/usergrid.sdk.js
portal/dist/usergrid-portal/js/usergrid-dev.min.js
portal/dist/usergrid-portal/js/usergrid.min.js
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/be93261f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/be93261f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/be93261f
Branch: refs/heads/two-dot-o
Commit: be93261fb53620163ae70318a5f8c329c5d2a830
Parents: 4d38aab
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Aug 13 17:10:48 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Aug 13 17:10:48 2014 -0400
----------------------------------------------------------------------
.../src/main/dist/lib/log4j.properties | 6 +++---
.../src/test/resources/log4j.properties | 22 +++++++++++++++++---
.../src/test/resources/log4j.properties | 2 +-
3 files changed, 23 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/be93261f/stack/awscluster/src/main/dist/lib/log4j.properties
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/lib/log4j.properties b/stack/awscluster/src/main/dist/lib/log4j.properties
index cf63e34..bf98cdf 100644
--- a/stack/awscluster/src/main/dist/lib/log4j.properties
+++ b/stack/awscluster/src/main/dist/lib/log4j.properties
@@ -18,7 +18,7 @@
# and the pattern to %c instead of %l. (%l is slower.)
# output messages into a rolling log file as well as stdout
-log4j.rootLogger=ERROR,stdout
+log4j.rootLogger=INFO,stdout
# stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
@@ -40,12 +40,12 @@ log4j.logger.org.apache.usergrid=INFO
#log4j.logger.org.apache.usergrid.locking.singlenode.SingleNodeLockManagerImpl=DEBUG, stdout
#log4j.logger.org.apache.usergrid.persistence=INFO
-log4j.logger.org.apache.usergrid.corepersistence=DEBUG
+#log4j.logger.org.apache.usergrid.corepersistence=DEBUG
#log4j.logger.com.netflix.hystrix=DEBUG
#log4j.logger.org.antlr=DEBUG
#log4j.logger.org.apache.usergrid.persistence.CollectionIT=DEBUG
-log4j.logger.org.apache.usergrid.persistence.index=DEBUG
+#log4j.logger.org.apache.usergrid.persistence.index=DEBUG
#log4j.logger.org.apache.usergrid.persistence.collection=DEBUG
#log4j.logger.org.elasticsearch=DEBUG
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/be93261f/stack/corepersistence/collection/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/resources/log4j.properties b/stack/corepersistence/collection/src/test/resources/log4j.properties
index 6d0c674..e765c29 100644
--- a/stack/corepersistence/collection/src/test/resources/log4j.properties
+++ b/stack/corepersistence/collection/src/test/resources/log4j.properties
@@ -1,15 +1,31 @@
+# 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.
+
# suppress inspection "UnusedProperty" for whole file
-log4j.rootLogger=DEBUG
+log4j.rootLogger=INFO
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %p %c{3}.%M(%L)<%t>- %m%n
-log4j.logger.org.safehaus.chop.plugin=DEBUG
+#log4j.logger.org.safehaus.chop.plugin=DEBUG
log4j.logger.org.safehaus.guicyfig=ERROR
log4j.logger.org.safehaus.chop.api.store.amazon=DEBUG
log4j.logger.org.apache.http=ERROR
log4j.logger.com.amazonaws.request=ERROR
log4j.logger.cassandra.db=ERROR
-log4j.logger.org.apache.usergrid.persistence.collection=DEBUG
+#log4j.logger.org.apache.usergrid.persistence.collection=DEBUG
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/be93261f/stack/corepersistence/queryindex/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/resources/log4j.properties b/stack/corepersistence/queryindex/src/test/resources/log4j.properties
index 9b1f8de..2ff29c6 100644
--- a/stack/corepersistence/queryindex/src/test/resources/log4j.properties
+++ b/stack/corepersistence/queryindex/src/test/resources/log4j.properties
@@ -18,7 +18,7 @@
# and the pattern to %c instead of %l. (%l is slower.)
# output messages into a rolling log file as well as stdout
-log4j.rootLogger=ERROR,stdout
+log4j.rootLogger=INFO,stdout
# stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender