cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xe...@apache.org
Subject [1/2] git commit: merge from 1.1
Date Mon, 28 May 2012 18:34:59 GMT
Updated Branches:
  refs/heads/trunk 0c8c8559a -> 4ec819eaa


merge from 1.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4ec819ea
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4ec819ea
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4ec819ea

Branch: refs/heads/trunk
Commit: 4ec819eaa696b550cad8418c79d48f3fbbf89bfb
Parents: 0c8c855 1d9b7f5
Author: Pavel Yaskevich <xedin@apache.org>
Authored: Mon May 28 21:30:56 2012 +0300
Committer: Pavel Yaskevich <xedin@apache.org>
Committed: Mon May 28 21:30:56 2012 +0300

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../apache/cassandra/cache/AutoSavingCache.java    |    7 +--
 src/java/org/apache/cassandra/db/DefsTable.java    |    5 ++
 .../db/compaction/AbstractCompactionIterable.java  |    5 --
 .../cassandra/db/compaction/CompactionInfo.java    |   40 +++++++++------
 .../cassandra/db/compaction/CompactionManager.java |   24 +++++++--
 .../cassandra/db/index/SecondaryIndexBuilder.java  |    2 -
 .../org/apache/cassandra/utils/FBUtilities.java    |   12 ++++
 8 files changed, 63 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ec819ea/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ec819ea/src/java/org/apache/cassandra/cache/AutoSavingCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ec819ea/src/java/org/apache/cassandra/db/DefsTable.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ec819ea/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java
index 72eca8e,1eb4e9b..41441df
--- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java
+++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java
@@@ -7,18 -9,18 +7,16 @@@
   * "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.
 + *     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.cassandra.db.compaction;
  
- import java.io.IOException;
- import java.util.ArrayList;
  import java.util.List;
  
  import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ec819ea/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
index 374d895,17d098b..02b2433
--- a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
@@@ -21,7 -22,8 +21,9 @@@ import java.io.Serializable
  import java.util.HashMap;
  import java.util.Map;
  
+ import org.apache.cassandra.config.CFMetaData;
+ import org.apache.cassandra.config.Schema;
 +import org.apache.cassandra.service.StorageService;
  
  /** Implements serializable to allow structured info to be returned via JMX. */
  public final class CompactionInfo implements Serializable

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ec819ea/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ec819ea/src/java/org/apache/cassandra/db/index/SecondaryIndexBuilder.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ec819ea/src/java/org/apache/cassandra/utils/FBUtilities.java
----------------------------------------------------------------------


Mime
View raw message