You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by af...@apache.org on 2011/12/02 16:50:59 UTC
svn commit: r1209546 - in /incubator/accumulo/branches/1.4: ./
src/server/src/main/java/org/apache/accumulo/server/test/performance/thrift/
src/server/src/main/java/org/apache/accumulo/server/thrift/metrics/
src/trace/src/main/java/cloudtrace/instrumen...
Author: afuchs
Date: Fri Dec 2 15:50:58 2011
New Revision: 1209546
URL: http://svn.apache.org/viewvc?rev=1209546&view=rev
Log:
ACCUMULO-86
Modified:
incubator/accumulo/branches/1.4/ (props changed)
incubator/accumulo/branches/1.4/NOTICE
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/performance/thrift/NullTserver.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/thrift/metrics/ThriftMetrics.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/thrift/metrics/ThriftMetricsMBean.java
incubator/accumulo/branches/1.4/src/trace/src/main/java/cloudtrace/instrument/thrift/TraceWrap.java
Propchange: incubator/accumulo/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 2 15:50:58 2011
@@ -1,3 +1,3 @@
-/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532
+/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541
/incubator/accumulo/branches/1.4:1205476
/incubator/accumulo/trunk:1205476,1205570,1208726
Modified: incubator/accumulo/branches/1.4/NOTICE
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/NOTICE?rev=1209546&r1=1209545&r2=1209546&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/NOTICE (original)
+++ incubator/accumulo/branches/1.4/NOTICE Fri Dec 2 15:50:58 2011
@@ -4,7 +4,7 @@ Copyright 2011 The Apache Software Found
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-This product includes Flot (http://http://code.google.com/p/flot/), which is
+This product includes Flot (http://code.google.com/p/flot/), which is
licensed under the MIT license.
Copyright (c) 2007-2009 IOLA and Ole Laursen
Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/performance/thrift/NullTserver.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/performance/thrift/NullTserver.java?rev=1209546&r1=1209545&r2=1209546&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/performance/thrift/NullTserver.java (original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/performance/thrift/NullTserver.java Fri Dec 2 15:50:58 2011
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
package org.apache.accumulo.server.test.performance.thrift;
import java.net.InetAddress;
Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/thrift/metrics/ThriftMetrics.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/thrift/metrics/ThriftMetrics.java?rev=1209546&r1=1209545&r2=1209546&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/thrift/metrics/ThriftMetrics.java (original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/thrift/metrics/ThriftMetrics.java Fri Dec 2 15:50:58 2011
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
package org.apache.accumulo.server.thrift.metrics;
import javax.management.ObjectName;
Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/thrift/metrics/ThriftMetricsMBean.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/thrift/metrics/ThriftMetricsMBean.java?rev=1209546&r1=1209545&r2=1209546&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/thrift/metrics/ThriftMetricsMBean.java (original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/thrift/metrics/ThriftMetricsMBean.java Fri Dec 2 15:50:58 2011
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
package org.apache.accumulo.server.thrift.metrics;
public interface ThriftMetricsMBean {
Modified: incubator/accumulo/branches/1.4/src/trace/src/main/java/cloudtrace/instrument/thrift/TraceWrap.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/trace/src/main/java/cloudtrace/instrument/thrift/TraceWrap.java?rev=1209546&r1=1209545&r2=1209546&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/trace/src/main/java/cloudtrace/instrument/thrift/TraceWrap.java (original)
+++ incubator/accumulo/branches/1.4/src/trace/src/main/java/cloudtrace/instrument/thrift/TraceWrap.java Fri Dec 2 15:50:58 2011
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
package cloudtrace.instrument.thrift;
import java.lang.reflect.InvocationHandler;