Merge branch '1.6.0-SNAPSHOT'
Conflicts:
core/src/main/java/org/apache/accumulo/core/data/Value.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c5b8335d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo
ACCUMULO-2487 match Value implementation to javadocs. check for null args.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f2920c26
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f2920c26
Diff: http://git-wip
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 828c3b3ee -> f2920c266
refs/heads/master a03071cd3 -> c5b8335d3
ACCUMULO-2487 match Value implementation to javadocs. check for null args.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT be688faa6 -> 828c3b3ee
refs/heads/master 5d0d6aa05 -> a03071cd3
ACCUMULO-2531 Use VolumeConfiguration instead of instance.dfs.dir in ClientOpts
VolumeConfiguration encompasses both instance.dfs.dir and instance.volumes.
Proje
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a03071cd
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a03071cd
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a03071
ACCUMULO-2531 Use VolumeConfiguration instead of instance.dfs.dir in ClientOpts
VolumeConfiguration encompasses both instance.dfs.dir and instance.volumes.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/828c3b3e
Tree:
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT d9fe31577 -> be688faa6
refs/heads/master afbf5f160 -> 5d0d6aa05
ACCUMULO-2527 Compiler warning cleanup.
For internal use of deprecations, where applicable, new tickets with TODOs were
placed in the comments to mark the
necessi
ACCUMULO-2527 Compiler warning cleanup.
For internal use of deprecations, where applicable, new tickets with TODOs were
placed in the comments to mark the
necessity to fix the code. To ease deprecation suppression, some code was
lifted into a single method to reduce impact.
Project: http://git
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5d0d6aa0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5d0d6aa0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5d0d6a
Repository: accumulo
Updated Branches:
refs/heads/master 72f2c954e -> afbf5f160
ACCUMULO-2522 fix timeout typo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/448a79e0
Tree: http://git-wip-us.apache.org/repos/asf/acc
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/afbf5f16
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/afbf5f16
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/afbf5f
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 0010b94e8 -> d9fe31577
ACCUMULO-2522 fix timeout typo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/448a79e0
Tree: http://git-wip-us.apache.org/repos
Repository: accumulo
Updated Branches:
refs/heads/1.5.2-SNAPSHOT fe5697a36 -> 448a79e00
ACCUMULO-2522 fix timeout typo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/448a79e0
Tree: http://git-wip-us.apache.org/repos
Merge remote-tracking branch 'origin/1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
assemble/src/main/assemblies/binary-release.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0010b94e
Tree: http://git-wip-u
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 2bf27adf0 -> 0010b94e8
ACCUMULO-2526
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fe5697a3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tre
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/72f2c954
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/72f2c954
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/72f2c9
Repository: accumulo
Updated Branches:
refs/heads/master 8218b7a5f -> 72f2c954e
ACCUMULO-2526
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fe5697a3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fe5697
Merge remote-tracking branch 'origin/1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
assemble/src/main/assemblies/binary-release.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0010b94e
Tree: http://git-wip-u
Repository: accumulo
Updated Branches:
refs/heads/1.5.2-SNAPSHOT 32cca6049 -> fe5697a36
ACCUMULO-2526
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fe5697a3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tre
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2ebc6e52
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2ebc6e52
Diff: http://git-wip-
Merge branch '1.6.0-SNAPSHOT' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2bf27adf
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8218b7a5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8218b7a5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8218b7
Repository: accumulo
Updated Branches:
refs/heads/master 262af7483 -> 8218b7a5f
ACCUMULO-2522 wait for accumulo to be up before testing the proxy
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/31b01e92
Tree: http://
Merge branch '1.5.2-SNAPSHOT' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.2-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/32cca604
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
test/system/auto/README.md
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a729c889
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a729c88
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/151fcb6d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/151fcb6d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/151fcb
Merge branch '1.6.0-SNAPSHOT' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2bf27adf
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
test/system/auto/README.md
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a729c889
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a729c88
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 341e60b88 -> 2bf27adf0
ACCUMULO-2522 wait for accumulo to be up before testing the proxy
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/31b01e92
Tree:
Merge branch '1.5.2-SNAPSHOT' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.2-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/32cca604
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3
Repository: accumulo
Updated Branches:
refs/heads/1.5.2-SNAPSHOT bcb0905c4 -> 32cca6049
ACCUMULO-2522 wait for accumulo to be up before testing the proxy
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/31b01e92
Tree:
Merge branch '1.5.2-SNAPSHOT' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.2-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/32cca604
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3
ACCUMULO-2239 reformat test README files to Markdown
Signed-off-by: Bill Havanki
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4fdefd78
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4fdefd78
Diff: http:/
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
Conflicts:
test/system/auto/README.md
test/system/bench/README
test/system/continuous/README
test/system/scalability/README.md
test/system/test1/README
test/system/test2/README
test/system/tes
ACCUMULO-2239 reformat test README files to Markdown
Signed-off-by: Bill Havanki
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4fdefd78
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4fdefd78
Diff: http:/
ACCUMULO-2239 reformat test README files to Markdown
Signed-off-by: Bill Havanki
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4fdefd78
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4fdefd78
Diff: http:/
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/262af748
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/262af748
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/262af7
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
test/system/auto/README.md
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/341e60b8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/341e60b
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
Conflicts:
test/system/auto/README.md
test/system/bench/README
test/system/continuous/README
test/system/scalability/README.md
test/system/test1/README
test/system/test2/README
test/system/tes
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
Conflicts:
test/system/auto/README.md
test/system/bench/README
test/system/continuous/README
test/system/scalability/README.md
test/system/test1/README
test/system/test2/README
test/system/tes
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
test/system/auto/README.md
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/341e60b8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/341e60b
Repository: accumulo
Updated Branches:
refs/heads/1.4.5-SNAPSHOT 0753a754b -> 4fdefd783
refs/heads/1.5.2-SNAPSHOT 246104c28 -> bcb0905c4
refs/heads/1.6.0-SNAPSHOT 3ce79a973 -> 341e60b88
refs/heads/master 1429eca95 -> 262af7483
ACCUMULO-2239 reformat test README files to Markdown
Signed-o
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3ce79a97
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3ce79a97
Diff: http://git-wip-us.apache.org/repos/asf/
Repository: accumulo
Updated Branches:
refs/heads/1.5.2-SNAPSHOT 1d608a81f -> 246104c28
refs/heads/1.6.0-SNAPSHOT ff0693cc5 -> 3ce79a973
refs/heads/master 0c37eeb9d -> 1429eca95
ACCUMULO-2489 Remove unneeded import
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1429eca9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1429eca9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1429ec
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3ce79a97
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3ce79a97
Diff: http://git-wip-us.apache.org/repos/asf/
ACCUMULO-2489 Remove unneeded import
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/246104c2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/246104c2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff
ACCUMULO-2489 Remove unneeded import
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/246104c2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/246104c2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff
Repository: accumulo
Updated Branches:
refs/heads/master fae163686 -> 0c37eeb9d
ACCUMULO-2458 make fewer queries over more blocks to emphasize bloom filter
performance
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0c37eeb9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0c37eeb9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0c37ee
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT bb8bdc066 -> ff0693cc5
ACCUMULO-2458 make fewer queries over more blocks to emphasize bloom filter
performance
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumul
Author: elserj
Date: Fri Mar 21 15:26:42 2014
New Revision: 902710
Log:
Publishing svnmucc operation to accumulo site by elserj
Added:
websites/production/accumulo/content/
- copied from r902709, websites/staging/accumulo/trunk/content/
websites/production/accumulo/content/1.4/apido
Author: buildbot
Date: Fri Mar 21 15:26:08 2014
New Revision: 902708
Log:
Staging update by buildbot for accumulo
Modified:
websites/staging/accumulo/trunk/content/ (props changed)
websites/staging/accumulo/trunk/content/git.html
Propchange: websites/staging/accumulo/trunk/content/
---
Author: elserj
Date: Fri Mar 21 15:26:02 2014
New Revision: 1579959
URL: http://svn.apache.org/r1579959
Log:
Ref the anchor rather than put it inline. Anchor to the relevant info on
kafka's page.
Modified:
accumulo/site/trunk/content/git.mdtext
Modified: accumulo/site/trunk/content/git.mdte
Author: buildbot
Date: Fri Mar 21 15:22:57 2014
New Revision: 902707
Log:
Staging update by buildbot for accumulo
Modified:
websites/staging/accumulo/trunk/content/ (props changed)
websites/staging/accumulo/trunk/content/git.html
Propchange: websites/staging/accumulo/trunk/content/
---
Author: elserj
Date: Fri Mar 21 15:22:45 2014
New Revision: 1579957
URL: http://svn.apache.org/r1579957
Log:
Applying Al's fix for a broken link
Modified:
accumulo/site/trunk/content/git.mdtext
Modified: accumulo/site/trunk/content/git.mdtext
URL:
http://svn.apache.org/viewvc/accumulo/site/
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fae16368
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fae16368
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fae163
Repository: accumulo
Updated Branches:
refs/heads/master ac2ddc53b -> fae163686
ACCUMULO-2504 use the volume manager to get the source/dest filesystems
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bb8bdc06
Tree: h
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 11d2dcf1a -> bb8bdc066
ACCUMULO-2504 use the volume manager to get the source/dest filesystems
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bb8bdc06
59 matches
Mail list logo