Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
README
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/04d51b3b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/04d51b3b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/04d51b3b
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 04d51b3b2f7c8f4f86954b4f10d14c00d9283457
Parents: d9852eb 5a130ad
Author: Sean Busbey <bus...@cloudera.com>
Authored: Mon Mar 24 14:28:17 2014 -0500
Committer: Sean Busbey <bus...@cloudera.com>
Committed: Mon Mar 24 14:28:17 2014 -0500
----------------------------------------------------------------------
README | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/04d51b3b/README
----------------------------------------------------------------------
diff --cc README
index 61df876,115a9b7..759c95b
--- a/README
+++ b/README
@@@ -358,9 -302,8 +358,9 @@@ redirected to the log dir
The public accumulo API is composed of :
* everything under org.apache.accumulo.core.client, excluding impl packages
- * Key, Mutation, Value, and Range in org.apache.accumulo.core.data.
- * org.apache.accumulo.minicluster
+ * Key, Mutation, Value, Range, Condition, and ConditionalMutation in
+ org.apache.accumulo.core.data.
- * org.apache.accumulo.server.minicluster, excluding impl package
++ * org.apache.accumulo.minicluster, excluding impl package
To get started using accumulo review the example and the javadoc for the
packages and classes mentioned above.
