usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [02/50] git commit: Merge branch 'key-row-sharding' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into key-row-sharding
Date Thu, 06 Nov 2014 00:14:48 GMT
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/two-dot-o
Commit: c02e77eef5316d0b220c51efacf99add9bda6fef
Parents: a5137ca ef4ede2
Author: Todd Nine <tnine@apigee.com>
Authored: Thu Oct 30 20:39:14 2014 -0600
Committer: Todd Nine <tnine@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>


Mime
View raw message