accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [1/3] git commit: Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT
Date Tue, 18 Feb 2014 17:09:43 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master ad9f9c13d -> 3e190398a


Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT


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

Branch: refs/heads/master
Commit: b0d5808892c92b15009791c9f8d03678415af32d
Parents: 00ff448 a9cd5d1
Author: Eric Newton <eric.newton@gmail.com>
Authored: Tue Feb 18 11:53:16 2014 -0500
Committer: Eric Newton <eric.newton@gmail.com>
Committed: Tue Feb 18 11:53:16 2014 -0500

----------------------------------------------------------------------
 CHANGES                                         | 807 ++++---------------
 bin/config.sh                                   |   9 +
 .../1GB/native-standalone/accumulo-env.sh       |   1 -
 conf/examples/1GB/standalone/accumulo-env.sh    |   1 -
 .../2GB/native-standalone/accumulo-env.sh       |   1 -
 conf/examples/2GB/standalone/accumulo-env.sh    |   1 -
 .../3GB/native-standalone/accumulo-env.sh       |   1 -
 conf/examples/3GB/standalone/accumulo-env.sh    |   1 -
 .../512MB/native-standalone/accumulo-env.sh     |   1 -
 conf/examples/512MB/standalone/accumulo-env.sh  |   1 -
 .../org/apache/accumulo/core/Constants.java     |   4 +-
 .../impl/TabletServerBatchReaderIterator.java   |  11 +-
 .../org/apache/accumulo/core/conf/Property.java |   1 +
 .../core/iterators/user/WholeRowIterator.java   |  55 +-
 .../apache/accumulo/core/util/AddressUtil.java  |   4 +
 .../iterators/user/WholeRowIteratorTest.java    |  24 +-
 pom.xml                                         |   2 +-
 .../org/apache/accumulo/proxy/SimpleTest.java   |  13 +-
 .../org/apache/accumulo/server/Accumulo.java    |  76 +-
 .../server/conf/TableConfiguration.java         |  14 +-
 .../server/gc/SimpleGarbageCollector.java       |  31 +-
 .../apache/accumulo/server/master/Master.java   |   5 +
 .../accumulo/server/monitor/LogService.java     |  81 +-
 .../apache/accumulo/server/monitor/Monitor.java | 333 +++++---
 .../org/apache/accumulo/server/util/Info.java   |   2 +-
 .../apache/accumulo/server/util/Initialize.java |   2 +
 .../accumulo/server/util/TServerUtils.java      |   1 +
 .../server/watcher/MonitorLog4jWatcher.java     | 154 ++++
 .../AccumuloReloadingVFSClassLoaderTest.java    |   9 +-
 .../providers/ReadOnlyHdfsFileProviderTest.java |   2 +-
 .../vfs/providers/VfsClassLoaderTest.java       |  11 +-
 .../apache/accumulo/test/AccumuloDFSBase.java   |  26 +-
 .../org/apache/accumulo/test/MetaSplitTest.java |   2 +-
 .../apache/accumulo/test/ShellServerTest.java   | 451 +++++++----
 34 files changed, 1025 insertions(+), 1113 deletions(-)
----------------------------------------------------------------------



Mime
View raw message