Author: vines
Date: Wed Jan 2 19:14:10 2013
New Revision: 1427920
URL: http://svn.apache.org/viewvc?rev=1427920&view=rev
Log:
ACCUMULO-787 - Merging 1427919
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
(props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
(props changed)
accumulo/trunk/packages/deb/accumulo/control
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1427919
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src/assemble:r1427919
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src/core:r1427919
Propchange:
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged
/accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1427919
Propchange:
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged
/accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1427919
Modified: accumulo/trunk/packages/deb/accumulo/control
URL:
http://svn.apache.org/viewvc/accumulo/trunk/packages/deb/accumulo/control?rev=1427920&r1=1427919&r2=1427920&view=diff
==============================================================================
--- accumulo/trunk/packages/deb/accumulo/control (original)
+++ accumulo/trunk/packages/deb/accumulo/control Wed Jan 2 19:14:10 2013
@@ -21,7 +21,7 @@ Package: accumulo
Version: [[version]]
Section: misc
Architecture: all
-Depends: java6-runtime, hadoop, hadoop-zookeeper, coreutils, ssh-server
+Depends: java6-runtime, hadoop, zookeeper, coreutils, ssh-server
Recommends: accumulo-native
Description: Accumulo is a large distributed structured store based on
Google's BigTable design.
Distribution: development
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src/server:r1427919
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src/src:r1427919
